Merge pull request #38 from jam231/dev_jam231

Issue #15
Merge branch 'master' of https://github.com/jam231/quizy