i was supposed to run bundle install.. are all these commits getting annoying yet?
Merge branch 'master' of https://github.com/lewisren/FuelEd
Deleted migration to add uid column since user already has that column
same for providers
still trying to fix
why you no woorrrkkkk
changed to print id instead of uid
fixing merges with current master
moved headers to layout/application.css, current /users/id view, when not logged in, sucks, but it'll do for now
added more feature files
resolving merge conflict (db & master)
added association lines
Update application_controller to search by UID
changed routes.rb file to eliminate 'resources :identites'
added belongs_to :school in appointments model
resolved merge conflict