nothing new
Merge branch 'master' of https://github.com/GrantFBarnes/MidtermMashup

Conflicts:
	mapTest.html
Merge branch 'master' of https://github.com/GrantFBarnes/MidtermMashup

Need to pull
test commit