Fisrt commit with branch
Merge branch 'egitBranch'

Conflicts:
	src/timmy/test/gittest/Main.java
Edited Reamme
Wow at this conflict
Add conflict 
Merge branch 'Test-branch'

Conflicts:
	src/timmy/test/gittest/Main.java