master
Master
Test2
Master + test2
Test2 + master
Merge remote-tracking branch 'origin/TDA_Test2'

Conflicts:
	test.php
Test2_2
Merge remote-tracking branch 'origin/TDA_Test2'

Conflicts:
	test.php
master function
master
test2
Merge remote-tracking branch 'origin/master' into TDA_Test2

Conflicts:
	test.php
Test2
Merge remote-tracking branch 'origin/TDA_Test1'

Conflicts:
	test.php
Test2
Merge remote-tracking branch 'origin/TDA_Test1'
Merge remote-tracking branch 'origin/TDA_Test2'

Conflicts:
	test.php
Test2
Merge remote-tracking branch 'origin/TDA_Test1'

Conflicts:
	test.php
Merge remote-tracking branch 'origin/TDA_Test2'

Conflicts:
	test.php