text updates
Merge branch 'master' of https://github.com/smokingbunny/simpleColor

Conflicts:
	simpleColor.lua