added circle, text is in progress
Merge branch 'master' of https://github.com/fannaroh/canvas