Fix to "Cheaters" problem.
Merge branch 'master' of https://github.com/sjchicks/code-marmalade

Conflicts:
	.idea/workspace.xml