new class for nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Book.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Book.java