conflict 유발자

한글나옴.
README.txt 바꿈
hello fix

fix hello
patch: I don't like the CEO

HAHA
Merge remote-tracking branch 'remotes/origin/team2' into merge_team1_and_2

Why I merged the files...

Conflicts:
	README.txt
Merge branch 'ceo_patch' into merge_team1_and_2

Conflicts:
	README.txt