Working copy
online updates
Merge branch 'master' of https://github.com/mrpsharp/notes