changed some colors on conflicts page
Merge branch 'master' of https://github.com/vickygx/theFrozzies