removed src/interfaces/python/docsrc/source/conf.py from git and added it to gitignore
removed src/interfaces/python/docsrc/source/conf.py from git and added it to gitignore
Merge pull request #99 from DerThorsten/master

removed conf.py and added it to .gitignore
Merge pull request #18 from opengm/master

update from master