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
fixed some whitespace
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
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