felix bla
changed Method
Merge branch 'master' of https://github.com/UniCopaOrg/OrgTestRepo
new text
Merge branch 'master' of https://github.com/UniCopaOrg/OrgTestRepo

Conflicts:
	JavaApplication2/src/javaapplication2/MyClass.java
another change
test
added new file# Please enter the commit message for your changes. Lines starting
dieser doofe kommentar
Merge branch 'master' of https://github.com/UniCopaOrg/OrgTestRepo into tuki_features
Merge branch 'ChristianesBranch' of https://github.com/UniCopaOrg/OrgTestRepo into DavidsBranch
hsdbdos
Merge remote-tracking branch 'origin/ChristianesBranch' into DavidsBranch
Merge remote-tracking branch 'origin/martin.rabe' into DavidsBranch
Merge remote-tracking branch 'origin/master' into tuki_features