Merge pull request #27 from yotammanor/newmodel

yotam: Changes to initial data and some cosmetic changes of sorts
Merge branch 'newmodel' of https://github.com/hasadna/kikar-hamedina into newmodel