Uppgift3:
	FileHandler:
		Fixat javadoc
Merge origin/master