Resolved Confict
Merge branch 'master' of github.com:kgutteridge/HackaHotel
Playing with Layout ..
Merge branch 'master' of github.com:kgutteridge/HackaHotel