First commit
Merge branch 'master' of https://github.com/P3ter/kriss_feed