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

Conflicts:
	MovieShare/config/routes.rb