branche créée
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
 resolution conflit
a bit more of rendreing
animation, warning the direct input of image is not tested
animated slowed
IA ennemy
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Modification des sons en ogg pour le support firefox
Merge branch 'Robin'

Conflicts:
	js/GameEntity.js
Première version de input.js
Première version de Input.js
Initialisation player and enemy
changmenents mineurs...
Merge branch 'laurianne'
Merge branch 'christophe'
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin

Conflicts:
	js/GameEntity.js
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin