Styled frameworks
More styling
Resolved merge conflict
Merge branch 'master' of https://github.com/lilyseropian/tag