I don't even know what this shit is
MERGIN
Fixed merge conflicts...
fixed delta bug
change migration number
change migration number fo actualz
git y r u retarded at mergin
Merge pull request #8 from UberMouse/sum_changes

bring master up to date