asdfjaolshg
Merge branch 'staging' of http://github.com/ideanl/discover into staging
Added feed controller