last commit before own tui-branch
a few changes in the Tui
last commit before own tui-branch
nothing changed
Merge branch 'newTui'

Conflicts:
	de.htwg.se.newPerangKolom/src/de/htwg/se/PerangKolom/controller/impl/PKController.java
Merge branch 'master' of
https://github.com/perangkolom/de.htwg.se.newPerangKolom.git

Conflicts:
	de.htwg.se.newPerangKolom/src/de/htwg/se/PerangKolom/aview/tui/TextUI2.java
	de.htwg.se.newPerangKolom/src/de/htwg/se/PerangKolom/controller/impl/PKController.java