randommovie
Merge branch 'master' of https://github.com/crampleg/MovieShare

Conflicts:
	MovieShare/app/controllers/pages_controller.rb
	MovieShare/app/views/pages/list.html.erb
	MovieShare/config/database.yml