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

Conflicts:
	get_location.js
Merge branch 'master' of https://github.com/PeterRyder/ITWS-Final-Project
Glowing location button
Custom Location updates