local changes
Merge branch 'master' of https://github.com/vverhun/testpresentation

Conflicts:
	firsttextfile.txt