Merge branch 'master' of https://github.com/medillcherubs/2014-cherub-map

Conflicts:
	index.html