Test
First Commit
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Merge fork/master
Deleted templates
Deleted Stray Folder
Deleted Stray Files
Merge fork/master
Revert "Deleted Stray Folder"

This reverts commit c974f470f367ea64c3e285820582d537cbedf2ec.
Revert "Deleted Stray Files"

This reverts commit effb7ea35b5c97e6d762f81f092fe993d92a102e.
More housekeeping (and getting to know git)
First Commit
Merge fork/master

Conflicts:
	resources/META-INF/MANIFEST.MF
	src/com/badrobot/subsystems/interfaces/IDriveTrain.java