...
Merge branch 'master' of github.com:amboxer21/hw2_rottenpotatoes

Conflicts:
	app/controllers/movies_controller.rb