edit in 02
Merge branch 'master' of https://github.com/gonex45/gittest

Conflicts:
	a.txt