sessions working
Merge pull request #2 from bmurphy1/sessions_working

sessions working
Merge branch 'master' into modify-sessions-new-and-css

Conflicts:
	app/views/welcome/index.html.erb