Labeled solenoid numbers used throughot the code
Fixed conflict in ScraperBike
Added Buttons for Pusher
Fixed conflict in OI.java
Merge pull request #14 from TheTimeLord/master

Cleaned code and Buttons for Pusher