This is actually a REST file
Merge remote-tracking branch 'upstream/master' into readme_rest
Merge pull request #19 from digitalrounin/readme_rest

This is actually a REST file