[ci skip]

update README.md
[ci skip]
Merge branch 'dev'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/dev'
Merge pull request #9 from danielfoord/master

Master