merging
Merge branch 'master' of https://github.com/stanri/video-waitlearning
drag and drop working, but still very buggy
merging