make changes to group#show styling
fixed merge conflict in styles.css;
Merge branch 'groups_styling'

Fixed merge conf in styles.css... stupid red borders
Merge branch 'master' of https://github.com/fence-lizards-2014/MetaGame