controller class integrated into player
Merge branch 'master' of github.com:HeartLine/heartline.github.com

Conflicts:
	js/player.js
insert shooting