Test commit after edit other place
Merge branch 'TestBrance'

Conflicts:
	TestApp/src/testapp/TestApp.java

So this is my merge I hope it works out ok.