Tons of changed things
things and other things
Merge origin/master into stuff

Conflicts:
	Hackbot 2014/src/com/fpsrobotics/CatapultSuggestedA.java
	Hackbot 2014/src/com/fpsrobotics/CatapultSuggestedB.java
	Hackbot 2014/src/com/fpsrobotics/DriveTrain.java
	Hackbot 2014/src/com/fpsrobotics/DriveTrainThreadSuggestedA.java
	Hackbot 2014/src/com/fpsrobotics/DriveTrainThreadSuggestedB.java
	Hackbot 2014/src/com/fpsrobotics/HackbotStation.java
	Hackbot 2014/src/com/fpsrobotics/Hackbots.java
	Hackbot 2014/src/com/fpsrobotics/Shooter.java
	Hackbot 2014/src/com/fpsrobotics/SpinnySticksControl.java
	Hackbot 2014/src/com/fpsrobotics/interfaces/DIOs.java
	Hackbot 2014/src/com/fpsrobotics/interfaces/ThreadsAndClasses.java

Lots and lots of things, packages and merge
Merge pull request #26 from RSchade/stuff

Tons of changed things