commit attyo
Merge branch 'master' of https://github.com/belmo/sample

Conflicts:
	sample.txt