*.so and *.o files deleted
ignore *.so and .o files
updated doxyfile; doc directory ingnored at master
doxyfile updated
ignore directory html
doxyfile configuration added
merge changes in the main repository (upstream)Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #1 from piklprado/master

Merging