Colors styling done
Merge branch 'master' of https://github.com/EMT/patterns

Conflicts:
	main.css