jp
Merge branch 'master' of github.com:JorgePadilla/Clarion-Hotel