add test for #1
add welcome page
Merge remote-tracking branch 'origin/master'