Updated entire project to get rspec working, corrupt directory?
Improve the README
Revert "Improve the README"

This reverts commit 163475c8aa035fc0881dd5e8baf9757e6919913d.
Merge branch 'master' of https://github.com/mitchellshelton/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb
	spec/spec_helper.rb