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