wrong branch, but changed logout confirmation
login now requires both fields
login displays welcome message
Merge pull request #119 from Tmee/registration

Registration
Fixed merge errors