basic stuff that Evan did wrong.
Merge branch 'ashEMP'

Conflicts:
	Assets/Scripts/MediumTorpedo.cs