organization and line edits
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Scripts/PlayerThrow.cs