Merge pull request #30 from htakahashi/hiro

Hiro
Updating videos, fixing secondary pages
Merge branch 'refs/heads/master' into hiro