Added player
Merge branch 'master' of https://github.com/technocf/LD28JAM

Conflicts:
	asset/js/game.js