merged john with master and resolved conflicts

-Motor controls and displays are working (just need to add some
numerical display)
-Motor status and sensor status is working (going to use images instead
of Phaser graphics though)
-Need to set up Start and Stop buttons
-Need to add displays for other sensors
-Need to make Forward and Reverse button appear in the 'down' position
after they've been clicked on, and vice versa