Fixed up city generation to return correct objects.
Merge branch 'master' of github.com:TCalvert93/Pointer

Conflicts:
	Assets/CityGeneration/CityGenerator.cs