updated styling
new model for displaying conflicts
Merge branch 'master' of https://github.com/vickygx/theFrozzies