psychic change
Merge branch 'master' of https://github.com/txtadventure/psychic-octo-lana

Conflicts:
	Release.txt