some cleanup; adding gitignore
OAuth is working
changing search activity to default

login isn't actually functional (or necessary), so calling the login
function won't move on to the next activity correctly

also, deleting unnecessary file
minor work on search
work on location fetching

not working yet, but close
work in progress

jade WIP
Cherry-picked "MapFragment and some little changes", resolved conflicts

Conflicts:
	AndroidManifest.xml
	res/layout/activity_search.xml
	res/layout/activity_search_result.xml
	res/values/strings.xml
	src/com/codepath/apps/wheretoeat/YelpClient.java
	src/com/codepath/apps/wheretoeat/activity/SearchActivity.java
fixing unresolved conflict
mocking locations more because yolo
successfully converting JSON results to Restaurant objects
pass restaurant data intent to searchresult activity
Adding restaurant info to view
visual cleanup
using linear layouts in activity search result
embedded map fragment into SearchResultActivity
result display cleanup
Adding marker code
To display MapView library added
Restaurant and curr location visible on Map
sending location data