mergetest 1000
Merge remote-tracking branch 'origin/testBranch'

Conflicts:
	testrepostory/src/main/java/testrepostory/Test.java
Merge remote-tracking branch 'origin/testBranch'

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

Conflicts:
	test.fodt
	testrepostory/src/main/java/testrepostory/Test.java