works?
Merge branch 'master' of https://github.com/joalon/Labb5.git

Conflicts:
	Labb5/view/BookInputDialog.java