regex scratch changes
Merge branch 'master' of github.com:monotasker/paideia
db changes from testing
resolving conflict in db contents