sessionsController update
Merge branch 'stephbranch' of github.com:lewisren/FuelEd into stephbranch

Conflicts:
	app/controllers/sessions_controller.rb
added information to appointments homepage
added information to appointments homepage
Merge branch 'stephbranch' of https://github.com/lewisren/FuelEd into stephbranch
added admin api endpoint
added information to appointments homepage
added RANK to users model
added RANK to users model
rebased with lewbranch; User rank functionality merged with dropdown selector in signup page
committing merges after rebasing with lewbranch and merging updated User model (with rank) and lewbranch's type drop-down selector in signup page
added rspec tests, edited formatting for apptcontroller, changed create appt link for appt index view
Merge branch 'stephbranch' of https://github.com/lewisren/FuelEd into stephbranch
added information to appointments homepage
added rspec tests, edited formatting for apptcontroller, changed create appt link for appt index view
Merge branch 'stephbranch' of https://github.com/lewisren/FuelEd into stephbranch
updated schema file
trying to fix css problems with heroku.. i precompiled something?
trying it again.. added gem rails_12factor to Gemfile
i was supposed to run bundle install.. are all these commits getting annoying yet?