fix merge conflicts
Merge pull request #20 from calblueprint/salesforce

Add Salesforce SDK to app