Committing everything I've done so far
Merge branch 'master' of https://github.com/loopyz/uStudy