1. Testcommit
Entwicklung in neuer Branch
Weiterentwicklung Master
Merge testbranch

Conflicts:
	src/test/Test.java
NewClass12312 added
NewClass added
Merge testbranch
Merge origin/master
NewClass modified
Variable x