Finished
Merge branch 'solution' of https://github.com/zealoushacker/NestedResources