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

Conflicts:
	MovieShare/app/views/login/new.html.erb