dddd
bnh
Merge branch 'master' of https://github.com/Chrono2013/chrono2.git

Conflicts:
	chrono3/src/chrono3/Book.java
Merge branch 'master' of https://github.com/Chrono2013/chrono2.git