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

Conflicts:
	MovieShare/app/controllers/pages_controller.rb