Color tag improvements
Merge branch 'master' of github.com:noorus/baybay

Conflicts:
	baybay.js