settle changes before pulling in revised
Merge branch 'master' of https://github.com/mulias/scripts
initial ideas for notes application