Merge remote-tracking branch 'origin/testBranch'

Conflicts:
	testrepostory/src/main/java/testrepostory/Test.java
Merge
test
Merge branch 'master' of https://github.com/britzke/testrepository.git
test
verändert
test
test
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project
	testrepostory/src/main/java/testrepostory/Test.java
Merge branch 'master' of https://github.com/britzke/testrepository.git

Conflicts:
	testrepostory/src/main/java/testrepostory/Test.java
Merge branch 'master' of https://github.com/britzke/testrepository.git