Merge pull request #10 from Kirstyvox/master

Resolved merge conflicts
Created Content Hierarchy Form