renamed main.js to main.js.coffee
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev