foo
Merge branch 'master' of https://github.com/bowmanrobotics/team1

Conflicts:
	nxt-g/settings.ini