Map erscheint
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/index.html