Add colors in
Merge branch 'master' of github.com:tmlayton/globalhack

Conflicts:
	public/index.html