merging
merging again Merge branch 'master' of github.com:sharetribe/marketing-site
screenshots, fixed horizontal scrolling bug
merging stuff again Merge branch 'master' of github.com:sharetribe/marketing-site