.
Merge branch 'master' of https://github.com/siniG/IR-Exercise4

Conflicts:
	IR-Exercise4/src/ExerciseManager/ExManager.java