'class' structure set up, merging
Merge branch 'master' of https://github.com/stanri/video-waitlearning