fixed player
fixed merge conflicts
added upload buttons
Merge branch 'master' of https://github.com/jczhang/doodlearn