to local
Merge branch 'master' of github.com:baremagazine/bare-website
fixing merge conflicts