branch 3 change
branch 3 change 2
more changes on master / text.txt
final master change
branch 3 change
branch 3 change 2
Merge branch 'branch_3'm into master

Conflicts:
	make_new_api_tars.sh
	test.txt