added post tagging
conflicts in stylesheets confirmed
resolved merge conflicts
Merge branch 'dev' of github.com:mattstuddert/rss_feed_reader into views
views