Redesign
Merge branch 'Redesign'
Merge branch 'master' of https://github.com/cosborne89/dormchef