commit pourri
Merge branch 'master' of https://github.com/xnorbal/MACSI1