soundmanager added
Merge branch 'master' of https://github.com/ingisg/html5-game

Conflicts:
	app/scripts/player.js