my little changes
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #46 from dazm12/release-1

Small welcome page changes