Merge branch 'master' of github.com:floatec/five-stages-of-killing

Conflicts:
	client/javascript/game/player.js
	client/javascript/game/view.js
	client/javascript/preload.js
Merge branch 'master' of github.com:floatec/five-stages-of-killing

Conflicts:
	client/javascript/game/player.js
	client/javascript/game/view.js
	client/javascript/preload.js