3d commit.
Merge branch 'master' of https://github.com/akacsys/tutorial

Conflicts:
	sample.txt