first commit
sample feed
second commit
.Merge branch 'master' of github.com:carnotweat/feed