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:
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
:gun:downloded foundation and bootstrap files
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
:fixed the application.html.haml file
minor mods, added authenticate_user! to before area :turtle:
Removed many extraneous files and code per Eliza's comments.
test refactored
Deleted more unnecessary stuff