web and final cut of watchman
Merge branch 'master' of https://github.com/cwdyang/wotyadoing