Commit after second branch creation and mod to class layout in Marks second branch.
Merge branch 'MarksSecondBranch' into master overwriting crockers
Merge branch 'Ribbon1'