- Started working on the Map.
Merge branch 'master' of https://github.com/demobiel/wow_website

Conflicts:
	public/js/home.js