old changes never commited
Merge branch 'master' of github.com:rlgeb/notes