added doxyconf and updated gitignore
Merge origin/master