Test Local 2
Local Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test.java
Test Master
Test Local 2
Local Test
Test Master
Merge branch 'test'
Merge remote-tracking branch 'origin/master'
Test branche