gitignore
start again from scratch
Merge branch 'master' of https://github.com/FeliciaLin/MapApp

Conflicts:
	Mapapp/TableViewController.swift