asdasd
Merge branch 'master' of https://github.com/drgerd/HelloGit

Conflicts:
	test2.txt