Added catch-all to routes, re-positioned lines in routes.rb, created blogfeed action and view, wrote tests for pages controller
rss collects posts from one source, tests arent passing yet
RSS working, tests failing
fixed conflicts
removed dodgy feed url, added datetime formatting, tests still not
fixed conflicts
rss parses posts sorted by date (regardless of author), allowed for caching in development to improve load time on blog page
tried (and failed) to add caching
added link to blogfeed to nav, added nav reference to blogfeed page
added caching in dev, cached blogfeed page with a 12hr expiry, installed gem cache for action caching
tests working for blogfeed page
fixed conflicts
projects styles and jobs
Merge branch 'master' into em_dev
Merge pull request #45 from emacca/em_dev

Em dev
Merge pull request #44 from sammyjopeters/blogagg

Blog Feed functionality