Revert "SS_Alpha_37"

This reverts commit 49ee8a624ff5546cd6378bd002f493ef7f8d3747.
SS_Alpha_39
Merge branch 'Physics-Test' of https://github.com/samsandweiss/Electrode_Master into Physics-Test

Conflicts:
	Assets/Level1.unity
	Assets/Scripts/sTrapDoor.cs.meta