p
Merge branch 'master' of https://github.com/JeuWebglEpsi/Space-Scavenger

Conflicts:
	public/javascripts/game/Map.js
k