Merge branches 'master' and 'develop' of github.com:kiddkai/note
modified gitignore
modified README.md to my cavas note
modified README.md