readme
Merge branch 'master' of https://github.com/74io/alpine-property

Conflicts:
	README.md