storyboard commit for Jess; code transfer coming along well;  reworking logic to be more stable that yesterday
commit before working with mapView stuff
MapViewController has no changes made to it (this class should have nothing to merge into master with)
ready for storyboard merging
tracking files issue resolved