recovered more stuff
shitshit
Database now works
 asf
Merge branch 'master' of
https://github.com/4ndrewCox/LexingtonAndroidApp.git

Conflicts:
	bin/R.txt
	bin/classes/com/capstone/Lexington/DatabaseHelper.class
	bin/classes/com/capstone/Lexington/Exhibit.class
	bin/classes/com/capstone/Lexington/MainActivity.class
	bin/classes/com/capstone/Lexington/MapActivity.class
	bin/classes/com/capstone/Lexington/R$id.class
	bin/classes/com/capstone/Lexington/R$integer.class
	bin/classes/com/capstone/Lexington/R$layout.class
	bin/classes/com/capstone/Lexington/R$menu.class
	bin/classes/com/capstone/Lexington/R$string.class
	bin/classes/com/capstone/Lexington/R$style.class
	bin/classes/com/capstone/Lexington/R$styleable.class
	bin/classes/com/capstone/Lexington/ScanActivity.class
	bin/classes/com/capstone/Lexington/SplashScreen.class
	bin/classes/com/capstone/Lexington/TutorialActivity.class
	gen/com/capstone/Lexington/R.java
	res/layout/activity_tutorial.xml
	src/com/capstone/Lexington/DatabaseHelper.java
	src/com/capstone/Lexington/Exhibit.java
Database works