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

mergetestfile
omg
Merge branch 'omg' into new_feature