Testing
add timeout erase when finished drawing
Merge branch 'master' of https://github.com/ohnova/TextActionFX
Merge pull request #1 from ohnova/boram

by boram
Testing 2
fix some runtime errors
Merge branch 'jangwook'
Merge remote branch 'origin/master' into jungwoong

Conflicts:
	app.html
Test
Testing
Merge pull request #2 from ohnova/jungwoong

Jungwoong
Test
Test
Merge remote branch 'origin/starry' into starry
Merge pull request #5 from ohnova/starry

Starry
Title
Merge pull request #6 from ohnova/starry

Title
delete aaaaa.js file
Merge pull request #7 from ohnova/starry

delete aaaaa.js file
Merge pull request #8 from ohnova/master

rebase