Merge branch 'master' into John
a few style changes

a few style changes
Merge branch 'John'
new buttons

new buttons
some output value text display changes

some output value text display changes
keyboard inputs for motor controls on a desktop

added keyboard inputs for motor controls, as an alternative to clicking
forward & reverse buttons on a desktop
Merge branch 'John'
organizing

organizing
fixed error with color name display testing

fixed error with color name display testing
fixed errors with gang 1 motor b and gang keyboard

fixed errors with gang 1 motor b and gang 2 keyboard input
Merge branch 'John'
fixed browser issue with a keyboard input

using the letter R as a keyboard input would affect the browser by not
allowing R to be used in a refresh command
Merge branch 'master' into John
small fixes

small fixes
adding channelData to update function

adding channelData to update function
some formatting, and channel/handler/publishing

some formatting, and experimentation with channel.handler, publishing
messages to channel. Working on updating speed setting in all dashboard
windows and working on smoothly rotating motor dials
fixed game position on screen

fixed game position on screen and deleted a logo file
added hand cursor on hovering over buttons

added hand cursor on hovering over buttons
Merge branch 'John'
Merge branch 'master' into Cole

Conflicts:
	index.html
	js/main.js