updating welcome and user pages
Merge branch 'master' of https://github.com/plom/plom.io
welcome page text update
Merge remote-tracking branch 'origin/master'
trying to fix welcome page