A lot of changes to compensate for no database
Merge branch 'master' of https://github.com/mwolotsky/cs480