Merge branch 'master' of ssh://charles/tank/andrew/school/notes