testing_branch commit for conflict
Merge branch 'master' into test_branch

Conflicts:
	b
commiting b file again