another update
fixed conflict
Merge branch 'master' of https://github.com/kekku500/test1.git

Conflicts:
	a file.txt