change function
change function
Merge branch 'master' of https://github.com/vschaefer/testRepo.git

Conflicts:
	HelloGit/src/books/Books.java