updated style
Merge branch 'feature/style' into dev
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev