Merge origin/master

Conflicts:
	.gitignore
	README.md
	build.xml
	resources/META-INF/MANIFEST.MF
	src/com/badrobot/OI.java
	src/com/badrobot/RobotMain.java
	src/com/badrobot/commands/BadCommand.java
	src/com/badrobot/commands/CommandBase.java
	src/com/badrobot/commands/DriveStraightForward.java
	src/com/badrobot/commands/Shoot.java
	src/com/badrobot/subsystems/BadSubsystem.java
	src/com/badrobot/subsystems/DriveTrain.java
	src/com/badrobot/subsystems/Shooter.java
	src/com/badrobot/subsystems/interfaces/IDriveTrain.java
	src/com/badrobot/subsystems/interfaces/IShooter.java
	src/com/badrobot/subsystems/interfaces/Logger.java
Fixed files
commented DriveStraightForward command
Merge pull request #7 from jacobbelding/master

New Comments