Sam's changes.
xMerge branch 'master' of github.com:amedeedaboville/findyourhappyplace