91016facc7
Fixed a few merge conflicts
kernelkind (2):
initial column storage
tmp remove DeckAuthor columns