mm
Merge branch 'master' of https://github.com/skmygdrs/code

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/skmygdrs/code
Merge branch 'master' of https://github.com/skmygdrs/code
Merge branch 'master' of https://github.com/skmygdrs/code
Merge branch 'master' of https://github.com/skmygdrs/code
modify