Rocks now reference the player object correctly.
Merge branch 'master' of https://github.com/doppelgangerx4/chasm

Conflicts:
Chasm/chasm/Assets/Chasm Assets/Scripts/PlayerScript.cs
Chasm/chasm/Assets/Chasm Assets/chasmTest.unity
Chasm/chasm/Assets/JumpTo.cs
Chasm/chasm/chasm.userprefs
Merge branch 'master' of https://github.com/doppelgangerx4/chasm

Conflicts:
	Chasm/chasm/Assets/Chasm Assets/Scripts/PlayerScript.cs
	Chasm/chasm/Assets/Chasm Assets/chasmTest.unity
	Chasm/chasm/Assets/JumpTo.cs
	Chasm/chasm/chasm.userprefs