adding local
Merge branch 'testBranching'

Conflicts:
	test.txt