edit2
Merge branch 'master' of https://github.com/aajune/Git0413

Conflicts:
	test.txt