stuff
Merge branch 'master' of github.com:mackm/www.earthboxinn.com
Merge branch 'master' of github.com:mackm/www.earthboxinn.com

stuff
Merge branch 'master' of github.com:mackm/www.earthboxinn.com
backup work in progress - not for main site