Update README.md
Merge branch 'master' of https://github.com/eadpucv/stampa
Merge branch 'master' into gh-pages