second commit on master
the first feature f001 submission
Merge branch 'feature/f001' of https://github.com/WindInHisHair/sample into feature/f001

Conflicts:
	readme