Changes
Merge branch 'master' of https://github.com/jonalonn/colors

Conflicts:
	css/style.css
	index.html
	js/main.js