this is test commit
bla
Merge branch 'master' of https://github.com/toka16/tester

Conflicts:
	New Text Document.txt