commit before pull
Merge branch 'master' of https://github.com/vinceashman/libraryManager

Conflicts:
	booklist.txt