erik
Merge branch 'master' of https://github.com/abt09kis/Projekt2-eit060

Conflicts:
	journalManager.java