commented out errors
xMerge branch 'master' of github.com:markusberget/tda593-hotel