adding stuff to test.txt
adding new local branch file and making some changes; also have push changes immediately checked
Merge remote-tracking branch 'origin/master' into testbranch

Conflicts:
	test.txt
Merge remote-tracking branch 'origin/master' into testbranch