Clean up
Merge branch 'master' of https://github.com/tillarnold/Cheaty

Conflicts:
	src/js/react.jsx