Revert "Some more traps."

This reverts commit 797a727e7e8c4faadd38a07a546d9502443b4e98.
Merge branch 'master' of https://github.com/SUMDude21/project_capcom

Conflicts:
	Assets/Scenes/full_house.unity