upstream merge
Merge remote-tracking branch 'upstream/master'
back end code for github auth via omniauth gem :whale2:
cleaned up excess model with rake db:rollback, and redid schema
:dolphin:
Added mailer for user registration and letter_opener gem for testing.
rails g devise:views
successful implementation of devise and omniauth/github :octopus:
added email_spec to Gemfile, prepared tests to use email_spec
Added mailer for user registration and letter_opener gem for testing.
added email_spec to Gemfile, prepared tests to use email_spec
Gravatar image shown on user profile page
add username login
cleaning up code
still cleaning up code
further cleaning code
last clean up
Added tests using email_spec
Merge branch 'mail' of https://github.com/maxwellv/squmblr into mail

Conflicts:
	spec/mailers/user_mailer_spec.rb
	spec/spec_helper.rb
Added mailer for user registration and letter_opener gem for testing.
added email_spec to Gemfile, prepared tests to use email_spec