new text
Merge branch 'master' of https://github.com/UniCopaOrg/OrgTestRepo

Conflicts:
	JavaApplication2/src/javaapplication2/MyClass.java
dieser doofe kommentar
Merge branch 'ChristianesBranch' of https://github.com/UniCopaOrg/OrgTestRepo into DavidsBranch