Merge branch 'master' of https://github.com/williamfgc/ADIOSPP.git

Resolve Conflixt
	doc/Doxyfile

.gitignore

+*.o
+*.a
+*.so
+
+#Eclipse
+.cproject
+.project
+.settings/
+

doc/Doxyfile

@@ -771,7 +771,7 @@ WARN_LOGFILE =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT = ../src ../include
+INPUT = ../src ../include 
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses