Commit from lab iMac
Merge branch 'master' of https://github.com/JeremyJeong/TouchMind.MP1.Media.Ajou

Conflicts:
	.DS_Store

TouchMind.MP1.Media.Ajou.xcodeproj/project.xcworkspace/xcuserdata/Jeremy
Jeong.xcuserdatad/UserInterfaceState.xcuserstate
	TouchMind.MP1.Media.Ajou/.DS_Store
Commit from lab iMac 2