Hierarchical resources
Merge branch 'master' of https://github.com/McOmghall/comp-pool.git