Added piwik tracking
Merge branch 'master' of https://github.com/swapnilg/morya
added feed page
Added feed extension
resolved issue #2
auto merged and resolved conflicts
Merge branch 'master' of https://github.com/swapnilg/morya