update
merge

Merge branch 'master' of https://github.com/macmanes/general_code