A comment goes here :]
2nd commit
Merge https://github.com/Pnayak156/SalesforceiOS

Conflicts:
	.gitignore
Conflict resolved
conflict resolved