Update TestApp/src/testapp/TestApp.java

Took out line 24 redundant hi++;
Merge branch 'TestBrance'

Conflicts:
	TestApp/src/testapp/TestApp.java

So this is my merge I hope it works out ok.
Well this is something different I hope
oh hey