Merge branch 'mergetest1'
Merge pull request #6 from aJihunJung/mergetest1

mergetestfile
omg