Pour merge
Merge branch 'master' of github.com:grifdail/GW2014-rebond
Correction | amelioration collision entre les elements
Merge branch 'master' of github.com:grifdail/GW2014-rebond

Conflicts:
	scripts/game/functions/bulletsEngine.js
	scripts/game/functions/bullets_collision.js