test of fork
Merge remote-tracking branch 'origin/Cole'
Merge branch 'master' into John
new key mappings

new key mappings
Merge branch 'John'
Merge pull request #7 from bittelc/master

test
updating gang sync

updating gang sync to handle removing a moving motor from a gang
Merge branch 'John'
debugging gang direction update issue

debugging gang direction update issue
color sensor colors

colors
fixed gang direction update error

fixed gang direction update error
Merge branch 'John'
Merge branch 'John' of https://github.com/dibaggioj/Dashboard_Mindstorm into dibaggioj-John

Conflicts:
	js/main.js
Merge pull request #9 from GigaBots/dibaggioj-John

John DiBaggio pull request
Merge branch 'master' into John
typo when fixing conflict

typo when fixing conflict
Merge branch 'John'
channel.publish function comment and readme

channel.publish function commented out, and readme
Merge branch 'John'
fixed issued with gang direction sync

fixed issued with gang direction sync