test2
Merge branch 'master' of https://github.com/apagg/agocontrol-work

Conflicts:
	gps/apaggGPS.py