test
add CNAME
change welcoming message
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'