reenable gps
Merge branch 'master' of https://github.com/keatonboyle/cs130_bulletinator
some small stuff
Merge branch 'master' of https://github.com/keatonboyle/cs130_bulletinator

Conflicts:
	Bulletinator/.idea/workspace.xml