Merge branch 'master' of https://github.com/morengab/new-pinboard

Conflicts:
README.md