fixed merge, added drag and drop
Merge branch 'master' of https://github.com/aishamidori/coursebubbles