Merge pull request 55
Merge branch 'SmokyBob-feature/material_design' into feature/material_design