resolved conflicts

resolved conflicts
conflict

conflict
resolved

resolved
Merge branch 'master' into John
layout changes

layout changes
new title
style changes

style changes
style and layout changes

style and layout changes
dashboard looking a bit sexier...

more style and layout changes!
Merge branch 'John'
made a number of appearance changes

made a number of appearance changes
new buttons

new buttons
Merge branch 'John'
fixed some buttons & changed game world dimensions

fixed some buttons & changed game world dimensions
Merge branch 'John'
hooked up motor gang forward & reverse buttons

gang button stuff in lines 780 to 872
checkbox stuff in lines 932 to 1103

Still need to hook up speeds for gangs and individual motors
speeds all set up with sliders and + & - buttons

"speed" used now in place "power"
all six sliders and pairs of plus & minus buttons should be functioning
correctly now
Merge branch 'John'
fixed a typo in the title

fixed a typo in the title
Merge branch 'master' into Cole