Merge pull request #15 from IGoldthwaite/master

1-13 Pull Request (OI.java) 
Fixing merge, buildable project
Providing feedback on DriveTrain implementation, see #14