Merge pull request #31 from chorus-frogs-2014/article_view

Article view
modified dump method so that it adds score datapoints to an article during its creation
local merge
Merge pull request #32 from chorus-frogs-2014/article_datapoints

Article datapoints
fixed popup header styling
updating branch to keep up with master

Merge branch 'master' into navigation
Merge pull request #33 from chorus-frogs-2014/navigation

Navigation
feedly_helper dump method now adds reddit comment count
local merge
Merge branch 'master' into article_datapoints
removed unnecessary p
Merge pull request #34 from chorus-frogs-2014/article_datapoints

Article datapoints
current version
Merge pull request #35 from chorus-frogs-2014/rails_angular_integration

current version
deleted the user_interface folder
Merge pull request #36 from chorus-frogs-2014/navigation

deleted the user_interface folder
Moved files from subdirectory to root directory.
Merge pull request #39 from chorus-frogs-2014/remove_subdirectory

Moved files from subdirectory to root directory.
updated css for search function
Merge pull request #41 from chorus-frogs-2014/stylesheets

updated css for search function
merged changes to move adding a article to User.rb