initial commit
Merge https://github.com/justinthrelkeld/Campus-Tour

Conflicts:
	css/styles.css
	js/map.js
	prototype.html