MeeshQuest Part 2
Merge branch 'master' of https://github.com/simonzhu91/MeeshQuest-Part-2