Revert pull request #26 from gilt/issue-19
Resolve merge conflict in api.json
Merge pull request #33 from gilt/revert-issue-19

Revert issue 19