add <branch1, 6>

Conflicts:
	demo.txt
modify 2 -> b and 3 -> c
Merge branch 'master' of https://github.com/fai717/test_repository into branch1

Conflicts:
	demo.txt