Deleted a bunch of stuff?  Idk, dangerous commit.
Everything that was deleted was added here?
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/Materials/Basic_GrassyHill.mat.meta
	Assets/Materials/Basic_HouseDoor.mat.meta
	Assets/Materials/Basic_Roof.mat.meta
	Assets/Materials/Basic_Wall_House.mat.meta
	Assets/PeopleSavedScript.cs.meta
	Assets/Prefabs.meta
	Assets/Prefabs/FireCube.prefab.meta
	Assets/Prefabs/House.prefab
	Assets/Prefabs/House.prefab.meta
	Assets/Prefabs/Steps.prefab.meta
	Assets/Prefabs/VillagerCubeBucket.prefab.meta
	Assets/Prefabs/VillagerGeneric.prefab.meta
Changed BaseLevel
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/BaseLevel.unity
Added Inventory Tracker.  Changed the location of the fire.
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/BaseLevel.unity