test shoot
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
update IA
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin

Conflicts:
	js/GameEntity.js
correction IA + merge
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'kevin'