Git is asking me to commit this, but we will not be using this file. I do as the git overlord commands
This is the new PubSub sketch. Currently only does GPS, but that's a big deal! This is for version control before I add the rest.
Merge branch 'master' of https://github.com/bradleypowers/olinoboat

Conflicts:
	code/arduino/Arduino_RosPubSub/src/Arduino_RosPubSub.ino
I'm just getting my repository up to speed here... should probably push and pull more.