renaming to a better name
Merge branch 'master' of https://github.com/bsletten/uberconf-2013-rest-workshop
Merge branch 'master' of https://github.com/bsletten/uberconf-2013-rest-workshop
initial cut at URI's
Exercise 2 commit for Team-DMBR, Package Delivery System
exercise 2, naming
Merge pull request #7 from wjohnson000/master

Mergeit
Merge pull request #6 from jason814/master

initial cut of URIs
Merge pull request #8 from rspieldenner/master

URL names for Team DMBR
2nd cut of museums
updated exercise 2
Notes
notes
Merge pull request #10 from lestopher/master

exercise 2
Merge pull request #9 from jason814/master

final pull request for URI's for purpleturtles
Git steps
Merge pull request #2 from bsletten/master

Update all