edit 4 files
edit 4 files in B3
Merge branch 'C4' into B3

Conflicts:
	authorAction.java
	bookAction.java
	bootsect.s
	setup.s
for merge with B3
merge again