Made database error strings more user friendly.
Merge remote-tracking branch 'jesse/master'
got rid of jesse json print check
Got refresh iPad hook set up.
Finished get JSON.
Really finished json stuff.
Merge remote-tracking branch 'eric/master'
Removed json NSLog from controller.
cleaned for commit
Merge remote-tracking branch 'jesse/master'
Merge remote-tracking branch 'kling/master'