updated with nav controller
updates
Code indented and Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into mario-update3

Conflicts:
	WellDoneiOS/PumpMapViewController.m
Merge pull request #33 from rajatb/mario-update3

Mario update3
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into TylerBranch2

Conflicts:
	WellDoneiOS/PumpDetailViewController.m
	WellDoneiOS/PumpMapViewController.m