yo
Merge branch 'master' of https://github.com/barbecuesoft/colorz
Merge branch 'master' of https://github.com/barbecuesoft/colorz
yo
dajene

Merge branch 'master' of https://github.com/barbecuesoft/colorz

Conflicts:
	css/style.css
	index.html
merge