map
Merge branch 'master' of https://github.com/josulliv101/campusmapbuilder

Conflicts:
	app/scripts/views/map.js