Merge pull request #99 from daviskim/master

Fix text on upload button
Fix font
Merge branch 'master' of github.com:daviskim/mojsart