some changes
Merge branch 'master' of https://github.com/vschaefer/helloGit.git

Conflicts:
	Books/src/Bookstore.java