Merge branch 'master' of https://github.com/gangplank/gpfeeds

Conflicts:
app/assets/javascripts/application.js
app/assets/stylesheets/application.css
merge