Add redcarpet to the development dependencies (yard needs it)
Merge branch 'master' into rspec

Conflicts:
	text_adventure.gemspec