Merge branch 'dev-add-text' into dev-SeokminKang
Merge branch 'dev' into dev-SeokminKang
update
Merge pull request #16 from SeokminKang/dev-Robin

Dev robin