whitewashing the colors til we get real colors from jason
adding user adding
Merge branch 'master' of https://github.com/chmontgomery/DominionTracker