Bugfixes
Fixes
Merge branch 'master' of github.com:teleolurian/sister-mercy

Conflicts:
	arise.rb