8
Merge branch 'master' of https://github.com/pi71/Test.git

Conflicts:
	p.txt