making it not eye bleeding
Merge branch 'master' of https://github.com/chmontgomery/DominionTracker

Conflicts:
	src/client/less/main.less