GitHub PushEvent at 2014-01-18 16:46:08
Repository: Nashoba-Robotics2014
Actor: alexbrinister
Payload: {"shas":[["c9fb5a054fa562467890949e8575bfb692a6897f","3f1a6e52b936378eb5e957a8e2ec99f3bfb9c8ca@yahoo.com","Added gitignore again","Alex Brinister",false],["c0c3b545ec94965f2b5fdc7a861304d820b77eba","3f1a6e52b936378eb5e957a8e2ec99f3bfb9c8ca@yahoo.com","Merge branch 'master' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2014\n\nConflicts:\n\t.gitignore\n\tBSD_License_for_WPILib_code.txt","Alex Brinister",false],["888e3ec265eba4a5b5aa3d933ad2f72867687cd6","3f1a6e52b936378eb5e957a8e2ec99f3bfb9c8ca@yahoo.com","Merge branch 'puncher'","Alex Brinister",false],["bf88a146bed9caa95763fa5c247d768607f9b627","3101400004de558f51dd49c57386acb33af17a71@savi.net","Added NRDashboard Class","Colin Willoughby",false],["ac5f1e9fa5fc25f912856d76c37363dd96852c6a","3101400004de558f51dd49c57386acb33af17a71@savi.net","Started adding NRDashboard Implementation","Colin Willoughby",false],["1173a6a4b52b4f6adf50484386c28eb4d83e26a8","6a964ade93ad43b241ea7267cebfdf45a123b3c6@comcast.net","Merge branch 'drive_train' into dashboard","unknown",false]],"size":6,"ref":"refs/heads/drive_train","head":"1173a6a4b52b4f6adf50484386c28eb4d83e26a8"}