gitignore
Merge branch 'master' of https://github.com/alexdd55/dmpsftbl-ios

Conflicts:
	dmpsftbl-ios.xcodeproj/project.pbxproj