First commit
Merge ssh://github.com/ekerstie/Resort-Hotel