Committing modifications
Merge branch 'master' of https://github.com/minutheresathomas/cmpe273-assignment1

Conflicts:
	src/main/java/edu/sjsu/cmpe/library/LibraryService.java