Fix horrible db hack so that it could even potentially work

in the bright communist future
Merge branch 'master' of https://github.com/nadvamir/GU-PSD3-Team-M