portal model working
households, assignment logic
try to fix merge with github?

Merge branch 'master' of github.com:zeevl/portalmon

Conflicts:
	.gitignore