2 table DB
Merge branch 'master' of https://github.com/JamesBrofos/Computer-Science-65

Conflicts:
	BookMatch/.settings/com.google.appengine.eclipse.core.prefs
	BookMatch/.settings/com.google.gdt.eclipse.core.prefs
	BookMatch/bin/BookMatch.apk
	BookMatch/bin/classes.dex

BookMatch/bin/classes/cs/dartmouth/edu/bookmatch/BookInfoActivity$3.clas
s
	BookMatch/bin/classes/cs/dartmouth/edu/bookmatch/BookInfoActivity.class

BookMatch/bin/classes/cs/dartmouth/edu/bookmatch/UserPreferencesFragment
.class

BookMatch/bin/dexedLibs/android-support-v4-5281266a04bbc712f446dd5e163b6
451.jar

BookMatch/bin/dexedLibs/google-play-services-fe43c884c1d96ccdbe12ec03ba3
91cf4.jar

BookMatch/bin/dexedLibs/google-play-services_lib-735ee6d6d7f0b684fa8106a
729a2c807.jar
	BookMatch/bin/res/crunch/drawable-hdpi/ic_launcher.png
	BookMatch/bin/res/crunch/drawable-mdpi/ic_launcher.png
	BookMatch/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	BookMatch/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	BookMatch/bin/resources.ap_
	BookMatch/src/cs/dartmouth/edu/bookmatch/BookInfoActivity.java
	BookMatch/src/cs/dartmouth/edu/bookmatch/ServerUtilities.java
	BookMatchServer/.classpath
	BookMatchServer/.project
	BookMatchServer/.settings/com.google.appengine.eclipse.core.prefs
	BookMatchServer/.settings/com.google.gdt.eclipse.core.prefs
	BookMatchServer/.settings/org.eclipse.jdt.core.prefs
	BookMatchServer/.settings/org.eclipse.wst.common.project.facet.core.xml
	BookMatchServer/src/META-INF/jdoconfig.xml
	BookMatchServer/src/META-INF/persistence.xml

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/data/BookEntity.jav
a

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/data/Datastore.java
	BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/gcm/Message.java
	BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/gcm/Response.java
	BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/gcm/Sender.java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/AddBookServl
et.java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/BaseServlet.
java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/BookMatchSer
verServlet.java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/MessageServl
et.java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/RegisterServ
let.java

BookMatchServer/src/cs/dartmouth/edu/bookmatchserver/server/Universals.j
ava
	BookMatchServer/src/log4j.properties

BookMatchServer/war/WEB-INF/appengine-generated/datastore-indexes-auto.x
ml
	BookMatchServer/war/WEB-INF/appengine-generated/local_db.bin
	BookMatchServer/war/WEB-INF/appengine-web.xml
	BookMatchServer/war/WEB-INF/classes/META-INF/jdoconfig.xml
	BookMatchServer/war/WEB-INF/classes/META-INF/persistence.xml

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/dat
a/BookEntity.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/dat
a/Datastore.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/gcm
/Message.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/gcm
/Response.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/gcm
/Sender.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/AddBookServlet.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/BaseServlet.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/BookMatchServerServlet.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/MessageServlet.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/RegisterServlet.class

BookMatchServer/war/WEB-INF/classes/cs/dartmouth/edu/bookmatchserver/ser
ver/Universals.class
	BookMatchServer/war/WEB-INF/classes/log4j.properties
	BookMatchServer/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.4.jar
	BookMatchServer/war/WEB-INF/lib/appengine-api-labs.jar
	BookMatchServer/war/WEB-INF/lib/appengine-endpoints-deps.jar
	BookMatchServer/war/WEB-INF/lib/appengine-endpoints.jar
	BookMatchServer/war/WEB-INF/lib/appengine-jsr107cache-1.9.4.jar
	BookMatchServer/war/WEB-INF/lib/asm-4.0.jar
	BookMatchServer/war/WEB-INF/lib/datanucleus-api-jdo-3.1.3.jar
	BookMatchServer/war/WEB-INF/lib/datanucleus-api-jpa-3.1.3.jar
	BookMatchServer/war/WEB-INF/lib/datanucleus-appengine-2.1.2.jar
	BookMatchServer/war/WEB-INF/lib/datanucleus-core-3.1.3.jar
	BookMatchServer/war/WEB-INF/lib/geronimo-jpa_2.0_spec-1.0.jar
	BookMatchServer/war/WEB-INF/lib/jdo-api-3.0.1.jar
	BookMatchServer/war/WEB-INF/lib/jsr107cache-1.1.jar
	BookMatchServer/war/WEB-INF/lib/jta-1.1.jar
	BookMatchServer/war/WEB-INF/logging.properties
	BookMatchServer/war/WEB-INF/web.xml
	BookMatchServer/war/favicon.ico
	BookMatchServer/war/main.jsp