7
8
9
Merge branch 'testing'

Conflicts:
	temp4.txt
Merge branch 'master' of https://github.com/mourednik/test