New URL
better spaces and tabs and crap like that
Merge branch 'master' of https://github.com/shelterconnect/frontend

Conflicts:
	includes/.DS_Store
	includes/mapdisplay.php