Ignore
Ignore this.
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/nbproject/project.bak.xml
	MasterRobot/nbproject/project.xml
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/MoveCameraOrArmCommand.java