website homepage complete
Merge branch 'master' of https://github.com/alyssialui/CodeSprint
correction to website links
recommendation.html
website/index.html
website/style.css
test
Merge branch 'master' of https://github.com/alyssialui/CodeSprint

Conflicts:
	CodeSprint/.metadata/.log
	CodeSprint/.metadata/.plugins/org.eclipse.cdt.core/.log
	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/.markers
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.projects/HotelLocator/org.eclipse.jdt.core/state.dat
	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/.root/.indexes/properties.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/797091720.index
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	CodeSprint/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	CodeSprint/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	CodeSprint/HotelLocator/bin/HotelLocator.apk
	CodeSprint/HotelLocator/bin/classes.dex
	CodeSprint/HotelLocator/bin/classes/com/example/hotellocator/DetailsFragment$1.class
	CodeSprint/HotelLocator/bin/resources.ap_
	CodeSprint/HotelLocator/src/com/example/hotellocator/SearchFragment.java
	CodeSprint/google-play-services_lib/bin/google-play-services_lib.jar