Work on geocoder
Merge branch 'master' of https://github.com/judahschvimer/serendipity

Conflicts:
	Serendipity/MapViewController.swift
added ui