minor fixes
Merge branch 'master' of https://github.com/BjarkeHou/PCGCity

Conflicts:
	src/controller/Controller.java