Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from adrienbarreau/master

chmod 777
Merge remote-tracking branch 'upstream/master'
ajout du moteur de directions branche sur maps
mise a jour du grunt
Merge pull request #4 from jefBinomed/master

merge
bugs
Merge branch 'master' of https://github.com/goplaysomewhere/GPSapp

Conflicts:
	www/partials/game/game.html
mise en place de maps
Merge pull request #5 from jefBinomed/master

mise en place de maps
commit map-service
mise en place base et base enemies
Merge pull request #6 from jefBinomed/master

mise en place base et base enemies
merge