khg
Merge branch 'master' of https://github.com/euromkay/NarratorLogicTester

Conflicts:
	src/BasicTest.java