Session config, routes updates
Merge branch 'session'

Updates
Merge branch 'master' of https://github.com/virg2718/sup

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/assets/stylesheets/login.css.scss
	app/controllers/application_controller.rb
	app/controllers/login_controller.rb
	app/views/login/login.html.erb
	config/routes.rb

	Updates