Email is only required for facebook, google and on site registration
Merge pull request #5 from ITBA/login_refactor

Email is only required for facebook, google and on site registration
Merge branch 'master' into relations

Conflicts:
	db/schema.rb