read input (test input)
standard input
Merge branch 'feature/combineThings' into GUI&Input

Conflicts:
	fileManager.pyc
	ui.py