added hotels
Merge branch 'master' of https://github.com/mastash3ff/Group-Project.git

Conflicts:
	GroupProject/bin/GroupProject.apk
	GroupProject/bin/classes.dex
	GroupProject/bin/classes/com/example/groupproject/MainActivity$2.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$3.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$4.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$5.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity$6.class
	GroupProject/bin/classes/com/example/groupproject/MainActivity.class
	GroupProject/bin/classes/com/example/groupproject/NewsFeed.class
	GroupProject/bin/classes/com/example/groupproject/R$layout.class
	GroupProject/bin/classes/com/example/groupproject/R$menu.class
	GroupProject/bin/classes/com/example/groupproject/R$string.class
	GroupProject/bin/classes/com/example/groupproject/R$style.class
	GroupProject/bin/resources.ap_
	GroupProject/gen/com/example/groupproject/R.java