auth providers
Merge branch 'master' of https://github.com/astraldragon/bad-movies

Conflicts:
	config/routes.rb