Merge branch 'master' of github.com:ividata/notes

* 'master' of github.com:ividata/notes:
Merge branch 'master' of github.com:ividata/notes

* 'master' of github.com:ividata/notes: