Merge
Merge branch 'dev' of https://github.com/jGrader/APIs.git