Changes!
Merge branch 'master' of https://github.com/TGMmhofbauer/mhofbauer

Conflicts:
	README.md
Merge branch 'master' of https://github.com/TGMmhofbauer/mhofbauer