precommit
Wrote many main methods
commit
Wrote many main methods 2
Merge origin/master

Conflicts:
	build.xml
	nbproject/project.bak.xml
	nbproject/project.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
commit
Merge pull request #1 from stevepopovich/master

Added OI, RobotMain, BadCommand, Xbox controller, sidecar, waiting on RobotMap
added BadSubsystem and Logger
init commit
init commit
messed my name somehow?
Update Logger.java

messed up my name...
Merge branch 'master' of https://github.com/BadRobots1014/PracticeSkylar2014.git
manu
manu
Merge pull request #2 from singhalmanu9/master

Added BadSubsystem and Logger
added comments
added comments
deleted the unnecessary Logger