test
Merge branch 'master' of https://github.com/PeterRyder/ITWS-Final-Project

Conflicts:
	get_location.js