a
Merge branch 'develop' of github.com:GensiKen-NNCT/Runaway into develop

Conflicts:
	source/text.h