Merge branch 'master' of https://github.com/bsletten/uberconf-2013-rest-workshop
Merge branch 'master' of https://github.com/bsletten/uberconf-2013-rest-workshop
exercise 2, naming
updated exercise 2
Merge pull request #10 from lestopher/master

exercise 2