fixed bug where restaurant#show page would break if not logged in
added user.name within the welcome message when logging in
fixed merge issues with sessions_controller