Long-overdue commit...
Fixing conflicts
Merge branch 'master' of https://github.com/marchoeppner/expression-database