Moved around methods in city.*pp
Multistep jobs, elves now require cleaning supplies to clean garbage
Merge remote-tracking branch 'ras0219/master'

Conflicts:
	city.cpp
	city.hpp
	workroom.cpp