added a custom welcome back message
Merge and added welcome back message