changed name to cs9322.rest.coffee
Merge remote-tracking branch 'origin/master'