test for branch conflict
This is a test
another test commit
Merge branch 'conflict-test'

Conflicts:
	de.htwg.se.newPerangKolom/src/de/htwg/se/PerangKolom/Test.java
Remove test file