added files that weren't versioned in my build
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame

Conflicts:
	Assets/TownScene.meta
	Assets/TownScene/DarkUnityAssets.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Classic American 50's Car.unity.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Prefabs.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Prefabs/Car1.prefab.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Resources.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Resources/Meshes.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Resources/Meshes/Materials.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Resources/Meshes/Materials/utd_car1_diffuse.mat.meta
	Assets/TownScene/DarkUnityAssets/Classic American 50's Car/Resources/Meshes/Materials/utd_car1_glass_diffuse.mat.meta
	Assets/TownScene/Materials.meta
	Assets/TownScene/Materials/Paths.mat.meta
	Assets/TownScene/Materials/Skybox.mat.meta
	Assets/TownScene/Materials/Tarmac.mat.meta
	Assets/TownScene/Materials/brown.mat.meta
	Assets/TownScene/Materials/green.mat.meta
	Assets/TownScene/Materials/orange.mat.meta
	Assets/TownScene/Models.meta
	Assets/TownScene/Models/Materials.meta
	Assets/TownScene/Models/Materials/Box01Mat.mat.meta
	Assets/TownScene/Models/Materials/Box02Mat.mat.meta
	Assets/TownScene/Models/Materials/Box03Mat.mat.meta
	Assets/TownScene/Models/Materials/Box04Mat.mat.meta
	Assets/TownScene/Models/Materials/Box05Mat.mat.meta
	Assets/TownScene/Models/Materials/Box06Mat.mat.meta
	Assets/TownScene/Models/Materials/Box07Mat.mat.meta
	Assets/TownScene/Models/Materials/Box08Mat.mat.meta
	Assets/TownScene/Models/Materials/Box09Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder01Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder02Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder03Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder04Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder05Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder06Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder07Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder08Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder09Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder10Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder11Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder12Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder13Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder14Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder15Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder16Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder17Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder18Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder19Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder20Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder21Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder22Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder23Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder24Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder25Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder26Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder27Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder28Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder29Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder30Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder31Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder32Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder33Mat.mat.meta
	Assets/TownScene/Models/Materials/Cylinder34Mat.mat.meta
	Assets/TownScene/Models/Materials/Default.mat.meta
	Assets/TownScene/Models/Materials/Kdeur.mat.meta
	Assets/TownScene/Models/Materials/Kglas.mat.meta
	Assets/TownScene/Models/Materials/Kgoot.mat.meta
	Assets/TownScene/Models/Materials/Klood.mat.meta
	Assets/TownScene/Models/Materials/Kstoep.mat.meta
	Assets/TownScene/Models/Materials/daklei.mat.meta
	Assets/TownScene/Models/Materials/kerkglas.mat.meta
	Assets/TownScene/Models/Materials/kerkmuur.mat.meta
	Assets/TownScene/Models/Materials/kerkstenen.mat.meta
	Assets/TownScene/Models/Materials/street_lampMat.mat.meta
	Assets/TownScene/Models/Materials/texfile10.mat.meta
	Assets/TownScene/Models/Materials/texfile12.mat.meta
	Assets/TownScene/Models/Materials/texfile13.mat.meta
	Assets/TownScene/Models/Materials/texfile15.mat.meta
	Assets/TownScene/Models/Materials/texfile17.mat.meta
	Assets/TownScene/Models/Materials/texfile19.mat.meta
	Assets/TownScene/Models/Materials/texfile2.mat.meta
	Assets/TownScene/Models/Materials/texfile4.mat.meta
	Assets/TownScene/Models/Materials/texfile6.mat.meta
	Assets/TownScene/Models/Materials/texfile8.mat.meta
	Assets/TownScene/Models/Materials/torentop.mat.meta
	Assets/TownScene/Models/Materials/wijzerplaat.mat.meta
	Assets/TownScene/Models/Pub.meta
	Assets/TownScene/Models/Pub/Materials.meta
	Assets/TownScene/Models/Pub/Materials/house_diffuse.mat.meta
	Assets/TownScene/Models/Streets.meta
	Assets/TownScene/Models/Streets/Materials.meta
	Assets/TownScene/Models/Streets/Materials/Crossing.mat.meta
	Assets/TownScene/Models/Streets/Materials/Sidewalk.mat.meta
	Assets/TownScene/Models/Streets/Materials/Street-T.mat.meta
	Assets/TownScene/Models/Streets/Materials/Street-X.mat.meta
	Assets/TownScene/Models/Streets/Materials/Street.mat.meta
	Assets/TownScene/Models/Trash Bin.meta
	Assets/TownScene/Models/Trash Bin/Materials.meta
	Assets/TownScene/Models/Trash Bin/Materials/contenerMat.mat.meta
	Assets/TownScene/Models/Trash Bin/Materials/coverMat.mat.meta
	Assets/TownScene/Models/Trash Bin/Materials/gris_poubelle.mat.meta
	Assets/TownScene/Models/Trash Bin/Materials/handleMat.mat.meta
	Assets/TownScene/Models/Trash Bin/trashbin.prefab.meta
	Assets/TownScene/Models/Trash box.meta
	Assets/TownScene/Models/Trash box/Materials.meta
	Assets/TownScene/Models/Trash box/Materials/02 - Default.mat.meta
	Assets/TownScene/Models/Trash box/Materials/04 - Default.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Alluminium Noteb.mat.meta
	Assets/TownScene/Models/Trash box/Materials/ChamferBoxMat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cone01.Cone02Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cone01Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cylinder01.Cylinder03Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cylinder04.Cylinder05Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cylinder04.Cylinder06Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Cylinder04.Cylinder07Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line01.Line20Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line01.Line22Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line01.Line24Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line01Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line02.Line21Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line02.Line23Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line02.Line25Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line02Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line04Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line05Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line18Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Line19Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_56.Obj_59Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_56.Obj_62Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_56.Obj_65Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_56Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_57.Obj_60Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_57.Obj_63Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_57.Obj_66Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_57Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_58.Obj_61Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_58.Obj_64Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_58.Obj_67Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Obj_58Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/Rectangle0Mat.mat.meta
	Assets/TownScene/Models/Trash box/Materials/mat_03.mat.meta
	Assets/TownScene/Models/derelict house.meta
	Assets/TownScene/Models/derelict house/Materials.meta
	Assets/TownScene/Models/derelict house/Materials/derelictBrickHouse.mat.meta
	Assets/TownScene/Models/derelict house/Materials/derelictBrickHouseMat.mat.meta
	Assets/TownScene/Prefabs.meta
	Assets/TownScene/Prefabs/Fences.prefab.meta
	Assets/TownScene/Prefabs/StreetLight.prefab.meta
	Assets/TownScene/Textures.meta
	Assets/TownScene/Textures/Terrain Textures.meta
	Assets/TownScene/Textures/Terrain Textures/Materials.meta
	Assets/TownScene/Textures/Terrain Textures/Materials/Grass (Hill).mat.meta
	Assets/TownScene/scripts.meta
Added missing spawn trap script
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame
added more animals
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame
worked on traping