Player.js
Merge branch 'master' of https://github.com/dremonkey/dotwars
Deleted main.js
Controller
Merge branch 'master' of https://github.com/dremonkey/dotwars
Player, controller
Merge branch 'master' of https://github.com/dremonkey/dotwars