Trying to make gitignore work
Trying more
Merge branch 'master' into PickupSubsystem

Conflicts:
	MasterRobot/nbproject/project.xml
Merge branch 'PickupSubsystem' of https://github.com/WestervilleWildWarbots/master into PickupSubsystem