Added view for welcome
Merged branch