fixed button mousedown merge conflict
Merge branch 'master' of https://github.com/aishamidori/coursebubbles