user && session
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	config/environments/development.rb