Updated docs
Merge branch 'master' of github.com:uWaterloo/api-documentation