tests for feeds controller
updates the factory for testing
testing for subscriptions controller
work in progress before merge with master
Added method to delete feeds
merge into master
Merge pull request #56 from chorus-frogs-2014/stylesheets

fixed ui recomendations by britney
local merge
Merge branch 'master' into testing

Conflicts:
	app/controllers/feeds_controller.rb
adds testing for feed model
adds testing for feeds_controller
modify schema and remove unnecessary news_rank folder
Merge pull request #57 from chorus-frogs-2014/schema

modify schema and remove unnecessary news_rank folder
modified toggleResults to change color of table row for feed on click
merge into master
manage feeds in sidebar - to be moved to settings pane
Merge pull request #58 from chorus-frogs-2014/angular_plus_2

Modified toggleResults to change color of table row for feed on click
exceptions to return if caught
added small fixes; sorting now fixed, popups now close automatically and forms cleared
Merge pull request #60 from chorus-frogs-2014/alec_fixes

added small fixes; sorting now fixed, popups now close automatically and...
Merge pull request #59 from chorus-frogs-2014/exception-handling

exceptions to return if caught