update
updates
Merge pull request #19 from rajatb/tyler-branch

Tyler branch
updates to detail view
fixed the swipe up interaction
adding gitignor entry
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into mario-mapview2

Conflicts:
	WellDoneiOS/PumpDetailViewController.m
	WellDoneiOS/PumpDetailViewController.xib
	WellDoneiOS/PumpMapViewController.m
	WellDoneiOS/PumpMapViewController.xib
Merge pull request #23 from rajatb/mario-mapview2

Mario mapview2
centering the map properly when the detail view is half lifted
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into testbranch
proper y offset
Merge pull request #24 from rajatb/testbranch

Testbranch
login screen
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into tyler-branch
commenting out an import