jkodf
dghbk
Merge branch 'master' of https://github.com/britzke/testrepository.git

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

Conflicts:
	.project
	test.fodt
	testrepostory/src/main/java/testrepostory/Test.java
Merge remote-tracking branch 'origin/master'

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