added schools to /admin/schools route
added schools to /admin/schools route
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
added schools to /admin/schools route
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
Added school to appointments model and changed appointment views
trying to fix css problems with heroku.. i precompiled something?
trying it again.. added gem rails_12factor to Gemfile
Added cucumber test files
added schools to /admin/schools route
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
added schools to /admin/schools route
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
end of merging all branches
merged in sahanas changes
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
resolving diverged branch