Updating videos, fixing secondary pages
Merge branch 'refs/heads/master' into hiro
Merge pull request #31 from htakahashi/hiro

Hiro