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:
rails g devise:views
successful implementation of devise and omniauth/github :octopus:
Cloned squmblr, edit email and password works
Tests for blank email, wrong pw confirmation
converted registrations edit.html to haml
add username login
cleaning up code
still cleaning up code
further cleaning code
last clean up
Merge branch 'master' of https://github.com/elizabrock/squmblr
merging eliza's master with local
minor mods, added authenticate_user! to before area :turtle:
User can recover password with email or username
fixed some whitespace
Removed many extraneous files and code per Eliza's comments.
test refactored