updated
Merge branch 'master' of github.com:rhaining/chromatic

Conflicts:
	config.plist
tacos