notes
Merge branch 'master' of github.com:Melanion/Caliber