map pins wired both ways
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS

Conflicts:
	WellDoneiOS/PumpDetailViewController.m