facebook
Merge branch 'master' of https://github.com/melatron/Movember-Game

Conflicts:
	public/index.html
	public/js/WorldMapController.js