fix error
fix another error
update
alter
alter code
add
Merge branch 'master' of https://github.com/gregt101/cmpe273-assignment1
commit
Merge branch 'master' of https://github.com/gregt101/cmpe273-assignment1

Conflicts:
	src/main/java/edu/sjsu/cmpe/library/api/resources/BookResource.java