merging
merging..
done merging
preparing for merge
finished merging
fixed text widget
Merge pull request #22 from stevenmiller888/master

fixed text widget