Merge branch 'master' of https://github.com/duckfred/test

Conflicts:
README.md
hmm