edit text
Merge pull request #26 from katiewood/master

edit text