Merge pull request #1 from minjulee/master

Create test.txt
Merge remote-tracking branch 'remotes/lmj/master' into lmj
asd