KRIS LIKES THE D
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/worldmap.css
	public/js/WorldMapController.js
Merge branch 'master' of https://github.com/melatron/Movember-Game