begin map implementation
try again
Merge branch 'master' of https://github.com/JamesBrofos/Computer-Science-65

Conflicts:
	BookMatch/res/layout/book_info_activity.xml
	BookMatch/src/com/example/bookmatch/BookEntry.java
	BookMatch/src/com/example/bookmatch/BookInfoActivity.java