editing the camera code again
adding hook motor classes
asdfgsgfkijuhygrfd
Merge remote-tracking branch 'origin/master'

Conflicts:
	initRobot/src/org/usfirst/frc3507/RobotMap.java
	initRobot/src/org/usfirst/frc3507/commands/CommandBase.java