Merge branch 'master' into dev
update welcome message
Merge branch 'master' into dev
Merge pull request #2 from alienresident/dev

Change welcome message