Struggle
Merge branch 'master' of https://github.com/kmunkitt/this-seems-fun

Conflicts:
	README.md