fix some patterns to match annotation, build part of homepage
Merge branch 'master' of https://github.com/kaoriprice/Group3