Modify session
Merge branch 'add-session'

Conflicts:
	app/views/shared/_footer.html.erb