conflict
Merge branch 'master' of https://github.com/Genesiz/Libary.git

Conflicts:
	src/gui/InfoDialog.java
	src/gui/NewItemDialog.java