changed colors to hex
Merge branch 'hex-colors' into develop

Conflicts:
	poem.txt
added another line
Merge remote-tracking branch 'origin/release-zappae'
added another line
Merge branch 'release-cool' into develop