B1
B2
Merge branch 'master' of https://github.com/felixdies82/test into B

Conflicts:
	test
Merge branch 'master' into A

Conflicts:
	test
A4