fixfixfix, and victory / defeat feature
Merge branch 'master' of https://github.com/Hatscat/CodeShaFu_project

Conflicts:
	js/events.js
	js/init.js
	js/step.js