daily update from blackbear
Merge branch 'master' of github.com:iurnah/notes