wrong branch, moving to logout
updated login
merged in logout
logout and welcome messages fixed