removing xcuserstate from git tracking
cleanup and fixing map bugs
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS
Code indented and Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into mario-update3

Conflicts:
	WellDoneiOS/PumpMapViewController.m