ignores
Merge branch 'master' of https://github.com/MediaFire/mediafire-objectivec-sdk

Conflicts:
	.gitignore