Initial commit for rebuild branch
Started refactoring out into a Composite pattern
Merge pull request #4 from zach2good/Rectangle_Refactor

Rectangle refactor