commits
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS

Conflicts:
	WellDoneiOS/AppDelegate.m
query to get pump
y Please enter the commit message for your changes. Lines starting