Fix missing user in session
Merge branch 'master' of https://github.com/TheCastleOfGoblins/SwordsAndBooks

Conflicts:
	swordsAndBooks/app/views/layouts/application.html.ejs