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

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