added sign-up redirect
Merge pull request #21 from chorus-frogs-2014/rails_angular_integration

added sign-up redirect
Merge pull request #22 from chorus-frogs-2014/ui

Ui
integrated ron's design
Merge pull request #23 from chorus-frogs-2014/rails_angular_integration

integrated ron's design
Updates the seed data with 100 random articles and two feeds
adds the methods needed to update the feed

updates feed when articles are requested by the front end only if the feed has new articles more than 15 minutes old.
Merge pull request #24 from chorus-frogs-2014/seeding-data

Updates the seed data with 100 random articles and two feeds
Merge pull request #26 from chorus-frogs-2014/error-handling

adds the methods needed to update the feed
small changes to js controller
small changes to js controller
Merge branch 'master' into rails_angular_integration
disabled forgery protection temporarily
Merge pull request #27 from chorus-frogs-2014/rails_angular_integration

Rails angular integration
fixed ui merge conflict
trying to merge