commit 12
Merge branch 'master' of http://github.com/vosermi/Test

Conflicts:
	Testfile.txt