added favicon

added favicon
Merge branch 'Cole'
some motor status stuff

some motor status stuff
motor status things

motor status things
onDown and onUp actions for forwardButtonD

Adding these actions and removing 'actionForwardOnClickD'  maybe works,
but the duration is probably not being recorded yet.
Also, replaced start/stop buttons with resume/pause buttons (that also
have grayed-out sprites to have show up when they shouldn't be
clickable, but this isn't hooked up yet)
Merge branch 'John'
new motor move and motor stop functions

also added checkbox functionality to handle 1 or 2 gangs
new motor move and stop messages

new motor move and stop messages
Merge branch 'John'
added some cleaner code snippets

added some snippets that might be useful to start cleaning up code
started cleaning up a little code

started cleaning up code for for/rev buttons and motor-ganging
checkboxes
still need to clean up the action functions by having one of each type
of function (not 4) but need to first figure out how to determine which
button was pressed that called the function...
Merge branch 'John'

Conflicts:
	js/main.js
fixed conflicts

fixed conflicts
Merge branch 'master' into John
still need to consolidate action functions

-Still need to consolidate action functions for buttons and checkboxes
-Some stuff that doesn't work yet is commented out
-Also, I've comment out everything in the update function that aren't
needed right now, because they were taking the place of messages. When
those messages are all hooked up, we'll still use some of this logic,
so keep it all there
fixed battery level and used some objects elsewher

fixed battery level and used some more objects elsewhere
Merge branch 'John' into Cole