did some shit
Merge branch 'master' of https://github.com/alyssialui/CodeSprint

Conflicts:
	CodeSprint/.metadata/.bak_0.log
	CodeSprint/.metadata/.log
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.indexes/a0/d6/history.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.indexes/a0/d6/properties.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.indexes/e4/81/96/9e/history.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.indexes/history.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.indexes/properties.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.markers
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/.markers.snap
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/org.eclipse.jdt.core/state.dat
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.snap
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/797091720.index
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	CodeSprint/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	CodeSprint/HotelLocator/bin/HotelLocator.apk
	CodeSprint/HotelLocator/bin/R.txt
	CodeSprint/HotelLocator/bin/classes.dex
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/DetailsFragment$1.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/DetailsFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/FeaturedFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/GoogleMapActivity$1.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/GoogleMapActivity.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/GoogleMapFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/HomeFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/MainActivity$DummySectionFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/MainActivity$SectionsPagerAdapter.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/MainActivity.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$id.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$layout.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$menu.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$string.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$style.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/R$styleable.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/SearchFragment$1.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/SearchFragment.class
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/SearchableActivity.class
	CodeSprint/HotelLocator/bin/resources.ap_
	CodeSprint/HotelLocator/gen/com/example/hotellocator/R.java
	CodeSprint/HotelLocator/src/com/example/hotellocator/GoogleMapActivity.java
	CodeSprint/google-play-services_lib/bin/google-play-services_lib.jar