add people's choice and good to know
Merge branch 'gh-pages' of github.com:BarkleyUS/showmetech into gh-pages