box collider changes
light,medium,heavy
sync
Merge branch 'master' of https://github.com/JordanLingHua/cs113Project

Conflicts:
	cs113Project/Assets/SpawnManager.cs