Merge branch 'Branches1'
Merge branch 'master' into Branches1
Merge branch 'Branches1'

Conflicts:
	test.txt
add 7
merge b1 7

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/whappy2000/sausage