test of fork
Merge remote-tracking branch 'origin/Cole'
Merge branch 'John'
Merge pull request #7 from bittelc/master

test
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' 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