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

Conflicts:
	src/gui/ListPanel.java
	src/gui/Mainframe.java
	src/library/Archieve.java
premerged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/ListPanel.java
	src/gui/Mainframe.java