fixed styling and table colors
updates conflicts
Merge pull request #20 from natewinn/david

fixed styling and table colors