Finished initial html and css pages
Added fonts
merged in new changes, should be uptodate
updated front_page.feature to reflect omniauth additions
aded create_account.feature
test
fixed appointments view to haml and looks nicer i hope.  also made git ignore all temp files.  also im really sorry for pushing to master.  and im sorry if my username still says saasbook
added routes to school
added routes to school
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
updated gemfile? wtf idk
redirects to appointments page if logged in, redirects from appts to login if not logged in, made things orange
added routes to school
updated gemfile? wtf idk
Merge branch 'lewbranch' of github.com:lewisren/FuelEd into lewbranch
sessionsController update
Merge branch 'stephbranch' of github.com:lewisren/FuelEd into stephbranch

Conflicts:
	app/controllers/sessions_controller.rb
moved indext page from users to identities and fixed all api endpoints for appoitnments to redirect to mainpage if not logged in
added information to appointments homepage
edited gemfiles