test
branch2 verändert
hallo
Merge branch 'branch2' into branch1

Conflicts:
	src/Hello.java
Merge pull request #2 from xerxes91/branch1

Branch1