Buildable portion of yelp UI only
Merge branch 'master' of https://github.com/CST316GroupO/Travellight

Conflicts:
	app/src/main/java/groupo/travellight/app/LoginActivity.java