who deleted
Merge branch 'master' of https://github.com/aJinseokJang/studyGit1

Conflicts:
	readme1.txt