includes occupied rooms in goal
Merge branch 'separate-simulator-and-executor' of https://github.com/Dunes/janitor into separate-simulator-and-executor

Conflicts:
	simulator/src/problem_creator.py