test
Merge remote-tracking branch 'upstream/master'
test
test
added text style editing
Merge pull request #5 from pasharayan/master

text