6/5 Start
Merge branch 'master' of https://github.com/JeremyJeong/TouchMind.MP1.Media.Ajou

Conflicts:
	.DS_Store
	TouchMind.MP1.Media.Ajou/TMViewController/.DS_Store