Merge branch 'master' into ui
styled buttons ready to merge inc new css
fixed ui merge conflict
trying to merge
Merge pull request #25 from chorus-frogs-2014/login_styled

Login styled
fixes a bug where articles were being saved without a feed_id
Merge pull request #28 from chorus-frogs-2014/article_view

fixes a bug where articles were being saved without a feed_id
Merge pull request #29 from chorus-frogs-2014/rails_angular_integration

added in-browser sorting, small fix in getArticles
current version