testing
Merge branch 'master' of https://github.com/AbeDillon/RenAdventure

Conflicts:
	README.txt
test
Merge branch 'master' of https://github.com/AbeDillon/RenAdventure
testing