Moving Location to person class
Merge branch 'master' of https://github.com/kelleyb/Where-R-U

Conflicts:
	iOS/Where R U?/Where R U?/MapsViewController.swift