Added basic colors and icons
Merge branch 'master' of https://github.com/mtlpy/mtlpyweb

Conflicts:
	output/feeds/all.atom.xml