Finished implementation of logger
Merge remote-tracking branch 'origin/master'

Conflicts:
	TDI/src/controller/BigLogic.java