change 1 to 6
Merge branch 'master' of github.com:nguyentrongnghia777/demogit

Conflicts:
	demo.txt