color picket done, voila button
Merge branch 'master' of https://github.com/ericluong/voila

Conflicts:
	public/css/main.css