Objet collide

objet collide
Merge branch 'master' of https://github.com/filippixavier/GW-Pilz

Conflicts:
	scripts/character.js
Merge branch 'master' of https://github.com/filippixavier/GW-Pilz