Fixes
Merge branch 'master' of https://github.com/mschurr/project.git

Conflicts:
	README.md