テスト
Merge branch 'master' of https://github.com/nishiguchiY/CashRegisterSimulation

Conflicts:

CashRegisterSimulation.xcodeproj/project.xcworkspace/xcuserdata/syaa_y.x
cuserdatad/UserInterfaceState.xcuserstate