...
Merge branch 'master' of https://github.com/rhaley503/movie-listing-demo

Conflicts:
	demo/app/controllers/application_controller.rb