deleted bin ness nasty
SQLRequest class
force commit
Merge branch 'master' of https://github.com/CCM-UMBC/CMSC331Project2

Conflicts:
	CulturalRetriever/bin/AndroidManifest.xml
	CulturalRetriever/bin/R.txt
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$attr.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$bool.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$color.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$dimen.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$id.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$integer.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$layout.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$string.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$style.class
	CulturalRetriever/bin/classes/android/support/v7/appcompat/R$styleable.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/GoActive.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/LandmarkIt.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/MainActivity.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/MainFlipper.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$attr.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$bool.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$color.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$dimen.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$id.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$integer.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$layout.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$menu.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$raw.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$string.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$style.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/R$styleable.class
	CulturalRetriever/bin/classes/com/example/CulturalRetriever/SliderPreferences.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$attr.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$color.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$id.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$integer.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$string.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$style.class
	CulturalRetriever/bin/classes/com/google/android/gms/R$styleable.class
	CulturalRetriever/bin/jarlist.cache
	CulturalRetriever/gen/com/example/CulturalRetriever/R.java
	CulturalRetriever/project.properties