database shenanigans
Merge branch 'master' of http://github.com/work-shop/work-shop