added freehand draw
merge stuff
begining to add text tool