add join for feed query
Merge branch 'master' of /home/yschaffer/Projects/horse1
Merge branch 'master' of github.com:yitznewton/whinny