Edit layout
Merge branch 'master' of github.com:alfredduffyer/CPE2-Hotel