Merge branch 'master' into John
drop-down bot selector menu mostly works

there's a problem with keeping the same robot select: if you click on
the robot already selected or if you click off of the drop down menu,
everything should go away and the robot number should not change
Merge branch 'John'
Merge branch 'Cole'

Conflicts:
	js/main.js
resolve conflict
formatting changes

formatting changes
Merge branch 'Cole'

Conflicts:
	js/main.js
resolve conflict
Merge branch 'master' into Cole