GPS changes
Merge branch 'master' of https://github.com/krobertson92/realtime

Conflicts:
	GPS.cpp
Merge branch 'master' of https://github.com/krobertson92/realtime