Changed the welcome message
Merge branch 'testing'