add color
Merge branch 'master' of https://github.com/gengen1988/amen

Conflicts:
	www/index.html