bug #1
Merge branch 'master' of https://github.com/vverhun/testpresentation5

Conflicts:
	sample.txt