Branch 2
Test Branch
Branch 1
test1
Test Branch
Merge branch 'Branch1'

Conflicts:
	TestGit/src/Test.java
Test