moved some tish around
Merge branch 'master' of https://github.com/tcb-hr/feed into db
Merge pull request #5 from tcb-hr/db

Db