Fixed a bug with querying feeds
Merge branch 'dev' of github.com:teampopong/pokr