domain model
Merge branch 'master' of https://github.com/objectpartners/petulant-adventure
adding columns
Merge branch 'master' of https://github.com/objectpartners/petulant-adventure