a
d
解像度設定
Merge branch 'master' into jin_branch

Conflicts:
	.DS_Store
	proj.ios_mac/.DS_Store

proj.ios_mac/TestProject.xcodeproj/project.xcworkspace/xcuserdata/kimjin
hyuck.xcuserdatad/UserInterfaceState.xcuserstate