Fixed Mergediue
Merge branch 'master' of https://github.com/srizzling/NatureQuestClient.git
Merge branch 'master' of https://github.com/srizzling/NatureQuestClient.git