rest api done!
Merge branch 'master' of https://github.com/awatson1978/rest-api