COllision with enemies (with tower don't working)
Merge branch 'master' of github.com:AdrianGaudebert/ludumdare29

Conflicts:
	js/classes/Enemy.js
	js/classes/Player.js
	js/states/Game.js