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
Merge branch 'master' of https://github.com/thomasstephane/eventoverflow
Changed line 5 to call from_omniauth so that the information will actually be stored in your db!
	modified:   app/controllers/session_controller.rb

Added a gravatar_for method to integrate gravatar pics
	modified:   app/helpers/users_helper.rb

Fixed line 56 since I had called oauth_token incorrectly
	modified:   app/models/user.rb

Added an email field when signing up
	modified:   app/views/users/_signup.html.erb

Added a gravatar picture of the user at the top of their profile
	modified:   app/views/users/show.html.erb

Modified test to make sure that a valid user has an email when logging in
	modified:   spec/features/user_spec.rb
Added email column to user table and integrated Gravatar (with Tests!)
Merge branch 'master' into gravatar
Added an email to the FactoryGirl :user
	modified:   spec/factories/events.rb

Added a test to check for entering the incorrect password when logging in
	modified:   spec/features/user_spec.rb
Merge branch 'origin' into design

Conflicts due to email adress added:
	app/views/users/_signup.html.erb
	app/views/users/show.html.erb
Added basic design for profile, gravatar, and list style
app/assets/stylesheets/forms.scss
app/assets/stylesheets/main-layout.scss
app/views/users/show.html.erb