f
Merge branch 'master' of https://github.com/loranazarenko/Library

Conflicts:
	src/library/Library.java