changmenents mineurs...
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
Debut implémentation Player
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
Implémentation Player/input
initialisation des enemies dans la map
Merge branch 'Robin'

Conflicts:
	index.html
commit pour merge
Merge branch 'master' of https://github.com/Maxipanda/N-Six into christophe
correction du bug dans input