Initial commit
Revert to 9a68400c25346f2a49f1ae73e49b4d533d1e372a
Initial commit
Merge branch 'master' of github.com:kooso/hw2_rottenpotatoes

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/movies_controller.rb
	app/models/movie.rb
	app/views/movies/index.html.haml
	config/cucumber.yml
	config/database.yml
	config/routes.rb
	db/seeds.rb
	lib/tasks/cucumber.rake
Fixed autograder problem moving "rating" field key from web_steps to movie_steps.
Merge branch 'hotfix/autograder_error'
Resolved a sintax error.