has filed to this version itunesconnect
has filed to this version itunesconnect
Merge branch 'master' of https://github.com/fumiharu/iCaxirola

Conflicts:
	Build/Intermediates/ArchiveIntermediates/iCaxirola/BuildProductsPath/Release-iphoneos/iCaxirola.app
	Build/Intermediates/ArchiveIntermediates/iCaxirola/BuildProductsPath/Release-iphoneos/iCaxirola.app.dSYM/Contents/Resources/DWARF/iCaxirola
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/AppDelegate.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/AppDelegate.dia
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/AppDelegate.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/Params.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/Params.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/UIView+iCaxirola.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/UIView+iCaxirola.dia
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/UIView+iCaxirola.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/ViewController.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/ViewController.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/iCaxirola
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/iCaxirola.LinkFileList
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/iCaxirola_dependency_info.dat
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/main.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7/main.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/AppDelegate.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/AppDelegate.dia
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/AppDelegate.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/Params.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/Params.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/UIView+iCaxirola.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/UIView+iCaxirola.dia
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/UIView+iCaxirola.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/ViewController.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/ViewController.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/iCaxirola
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/iCaxirola.LinkFileList
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/iCaxirola_dependency_info.dat
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/main.d
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/Objects-normal/armv7s/main.o
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/assetcatalog_dependencies.txt
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/assetcatalog_generated_info.plist
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/build-state.dat
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/iCaxirola-project-headers.hmap
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/iCaxirola.dep
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/iCaxirola.hmap
	Build/Intermediates/ArchiveIntermediates/iCaxirola/IntermediateBuildFilesPath/iCaxirola.build/Release-iphoneos/iCaxirola.build/iCaxirola.xcent
	Build/Intermediates/iCaxirola.build/Debug-iphoneos/iCaxirola.build/iCaxirola-project-headers.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphoneos/iCaxirola.build/iCaxirola.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphoneos/iCaxirolaTests.build/iCaxirolaTests-project-headers.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphoneos/iCaxirolaTests.build/iCaxirolaTests.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/AppDelegate.d
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/AppDelegate.o
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/Params.d
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/Params.o
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/UIView+iCaxirola.d
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/UIView+iCaxirola.dia
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/UIView+iCaxirola.o
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/ViewController.d
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/ViewController.o
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/iCaxirola.LinkFileList
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/iCaxirola_dependency_info.dat
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/main.d
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/Objects-normal/i386/main.o
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/assetcatalog_dependencies.txt
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/assetcatalog_generated_info.plist
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/build-state.dat
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/build-state~.dat
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/iCaxirola-project-headers.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/iCaxirola.dep
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/iCaxirola.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirola.build/iCaxirola~.dep
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirolaTests.build/iCaxirolaTests-project-headers.hmap
	Build/Intermediates/iCaxirola.build/Debug-iphonesimulator/iCaxirolaTests.build/iCaxirolaTests.hmap
	Build/Products/Debug-iphonesimulator/iCaxirola.app.dSYM/Contents/Info.plist
	Build/Products/Debug-iphonesimulator/iCaxirola.app.dSYM/Contents/Resources/DWARF/iCaxirola
	Build/Products/Debug-iphonesimulator/iCaxirola.app/Base.lproj/Main.storyboardc/UIViewController-vXZ-lx-hvc.nib
	Build/Products/Debug-iphonesimulator/iCaxirola.app/Base.lproj/Main.storyboardc/vXZ-lx-hvc-view-kh9-bI-dsS.nib
	Build/Products/Debug-iphonesimulator/iCaxirola.app/Info.plist
	Build/Products/Debug-iphonesimulator/iCaxirola.app/ViewController.nib
	Build/Products/Debug-iphonesimulator/iCaxirola.app/iCaxirola
	iCaxirola.xcodeproj/project.pbxproj
	iCaxirola.xcodeproj/project.xcworkspace/xcshareddata/iCaxirola.xccheckout
	iCaxirola.xcodeproj/project.xcworkspace/xcuserdata/fumiharu.xcuserdatad/UserInterfaceState.xcuserstate
	iCaxirola.xcodeproj/xcuserdata/fumiharu.xcuserdatad/xcschemes/iCaxirola.xcscheme
	iCaxirola.xcodeproj/xcuserdata/fumiharu.xcuserdatad/xcschemes/xcschememanagement.plist
	iCaxirola/AppDelegate.h
	iCaxirola/AppDelegate.m
	iCaxirola/Base.lproj/Main.storyboard
	iCaxirola/Images.xcassets/AppIcon.appiconset/Contents.json
	iCaxirola/Params.h
	iCaxirola/UIView+iCaxirola.h
	iCaxirola/UIView+iCaxirola.m
	iCaxirola/ViewController.h
	iCaxirola/ViewController.m
	iCaxirola/ViewController.xib
	iCaxirola/iCaxirola-Info.plist
	iCaxirola/main.m
	iCaxirolaTests/iCaxirolaTests.m