new a.txt
Merge branch 'master' of https://github.com/baxx007/try_git

Conflicts:
	a.txt
hihi