kl
jkd
l
Merge branch 'master' of https://github.com/lucka318/BozicnaBajka.git

Conflicts:
	gallery.jpg
	src/hr/fer/linolada/artbook/application/ArtBook.java
	src/hr/fer/linolada/artbook/gui/GenericPanel.java