add +1
Merge branch 'b1'

Conflicts:
	test1
add in gitignore
Merge remote-tracking branch 'origin/master'