More text stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	gui/guiText.js