Working on manets
Merge branch 'master' of https://github.com/abrosen/notes