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

Conflicts:
	www/partials/game/game.html
commit map-service
merge
Merge pull request #9 from adrienbarreau/master

Autorise moi stp :)