Adding line after creating Test branch
Merge remote-tracking branch 'origin/Test'

Conflicts:
	src/GitHelloWorld.java

I'm not sure what to do
I had to change some things