test0
second
Merge branch 'C4' into B3

Conflicts:
	DBConnection.java
	src/po/author.java
	src/po/book.java
Merge pull request #2 from redseven7/1120310509

1