merge
Merge branch 'dev' of https://github.com/MetaLang/RubyQuest into dev