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
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
animation, warning the direct input of image is not tested
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
animated slowed
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
IA ennemy
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Utilisation de AssetManager dans LevelScreen
Utilisation AssetManager dans GameEntity.js
Merge branch 'Robin'

Conflicts:
	js/GameEntity.js
Initialisation player and enemy
Merge branch 'laurianne'