my first github commit
Merge branch 'master' of https://github.com/calmglow/colanote