Merge branch 'Hotfix'
Merge branch 'master' of https://github.com/jneville-amresorts/Hello-World