Welcome message displays on all pages when user is logged in.
Merge branch 'logged_in_branch' of github.com:gSchool/g2-store

Changed welcome_email test so it is more flexible

Conflicts:
	app/controllers/users_controller.rb