fixed itesm
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30

Conflicts:
	js/enemies.js