added line
Merge branch 'master' of github.com:bukka-/test

Conflicts:
	test2.txt