remove unused feed.js code
fix merge conflicts
integrate sass