foo
Merge branch 'master' of https://github.com/madmunky/Bloodwych

Conflicts:
	ObjectActions.js
	player.js