SCDコミット
SCDコミット
commit

commit
Merge branch 'master' of https://github.com/asoarm/arm

Conflicts:
	arm.xcodeproj/project.xcworkspace/xcshareddata/arm.xccheckout
Commit

commit
Merge branch 'master' of https://github.com/asoarm/arm