Test file changes committed
COmmit after merge
test class changes committed
Commit changes after merge
Commit from Master
Merge branch 'testChild'

Conflicts:
	EGITJavaProject/bin/TestClass.class
	EGITJavaProject/src/TestClass.java
Merge branch 'testChild'

Conflicts:
	EGITJavaProject/src/TestClass.java
Child 2 branch changes committed
Child 2 stuff added
Merge branch 'testChild'

Conflicts:
	EGITJavaProject/bin/TestClass.class
	EGITJavaProject/src/TestClass.java
Commit changes in Master
Changes in master Testclass
Commit
Commit changes
New Java file HelloWorld6
Comiting TestChild Changes
Merge branch 'master' into testChild
Changes committed in testChild
Main Branch commit after merge
File commit done in Master