Add message when a user logs in
Merge remote-tracking branch 'origin/master'