fix stuff
Merge branch 'master' of https://github.com/vid14114/TDI.git

Conflicts:
	TDI/src/model/ConfigLoader.java