Some database stuff
Merge branch 'master' of github.com:star-yellow-team/star-defence