Added user.email to self.from_omniauth and changed user.password to a random hex instead of 'password'
	modified:   app/models/user.rb

Added a email column to the user table
	new file:   db/migrate/20130609002641_add_email_column_to_user.rb
Updating
Merge branch 'master' into add_provider_stuff