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
little modif
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Modification des sons en ogg pour le support firefox
Utilisation de AssetManager dans LevelScreen
Utilisation AssetManager dans GameEntity.js
Merge branch 'Robin'

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