adds colors
Merge branch 'master' of git://github.com/2easy/nailmaker

Conflicts:
	config/routes.rb
	db/schema.rb