tests for twitter fetcher and reddit fetcher
merging master locally

Merge branch 'master' into testing
adds auto update function
local merge

Merge branch 'master' into autoupdate
adds the set interval timer to automatically refresh the articles and the feeds
Fixes server error, renders nothing
local merge

Merge branch 'master' into autoupdate
Merge pull request #74 from chorus-frogs-2014/autoupdate

Autoupdate
Merge branch 'master' of https://github.com/chorus-frogs-2014/NewsRank

Conflicts:
	app/assets/javascripts/controllers.js
local merge
Merge branch 'master' into testing
work in progress
working test suite
Merge pull request #76 from chorus-frogs-2014/testing

Testing
fixes the ability of the user to delete feeds
Merge pull request #77 from chorus-frogs-2014/feed_fix

fixes the ability of the user to delete feeds
added rescue to facebook fetcher
work in progress
local merge

Merge branch 'master' into testing
many minor fixes and visual improvements
many minor fixes and visual improvements