commit 2
Merge branch 'master' of https://github.com/wearp/petulant-craziness

Conflicts:
	README.md