.
Merge branch 'master' of https://github.com/sarchome/rspec_md

Conflicts:
	config/routes.rb

.