twk
Merge branch 'master' of https://github.com/josulliv101/campusmaps

Conflicts:
	src/images/icon-carmichael.png
	src/index.html