adding the map into the main view
not sure what this is
Merge branch 'master' of https://github.com/dmcquillan314/ZipTripV2

Conflicts:
	ZipTripV2/ViewController.swift