push
Merge branch 'master' of https://github.com/m140726/RubyQuest

Conflicts:
	RubyQuest.rb
Made a whole lot of changes