merge
new fields in db
Merge branch 'master' of https://github.com/Fortisque/halloftime