changed signup process to reflect admin's creation of intern/client accounts (i.e. don't automatically sign in as newly created account, redirect to userinfo page after new creation, etc.  ALSO school model to include full address information
resolving diverged branch
added association lines
resolving merge conflict (db & master)
added association lines
Update application_controller to search by UID
changed routes.rb file to eliminate 'resources :identites'
Added new views, added routing for admin check, added css
added room to appointments
added belongs_to :school in appointments model
resolved merge conflict
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
added schools to /admin/schools route
Added school to appointments model and changed appointment views
end of merging all branches
fixed some whitespace