Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki
added provider and uid columns to user model
made sessions controller
fixed column types in users table
implemented omniauth signup, signin, signout (I think)
Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki
fixed merge conflicts
ran new migrations
merge conflict
Merge branch 'users'
merge conflicts
Merge branch 'master' of github.com:katiespiders/SeeMore-Khaki