testing conflicts
Merge branch 'master' of github.com:evanyeung/HelloSite
fix that
Merge branch 'master' of github.com:evanyeung/HelloSite
update views and urls in both