Committing files but not sure what they are

These files show that they need to be committed but I am not sure
why they need to be
Merge branch 'master' of https://github.com/MinorTechnologiesLLC/shortnoticeny-app-ios

Conflicts:
	platforms/ios/ShortNotice.xcodeproj/project.xcworkspace/xcshareddata/ShortNotice.xccheckout