Merge branch 'dev-add-text' into dev-justin
Merge branch 'dev' into dev-justin
Updated jkimau.txt.
Merge pull request #18 from justinyoo/dev-modify-jim

Dev modify jim