Put SimpleCov support and rolled back some files after a cucumber crash
Resolved conflicts.

Merge branch 'master' of github.com:hufflepuffbr/hw4_rottenpotatoes

Conflicts:
	app/controllers/movies_controller.rb
	config/routes.rb
	features/coverage/index.html
	features/coverage/resultset.yml
	log/test.log
	spec/controllers/movies_controller_spec.rb