nothing happend
conflict merged
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
pulling from upstream
merged conflicts
fixed tests after nesting resources. all but one passes
merged conflicts
Merge pull request #38 from nickpassarella/master

Fixed tests after nesting resources. One error in the ordered items controller.