data model (continued, not finished)
Merge branch 'master' of github.com:kvakvs/macaba