rock throwing alpha 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityFolder/Assets/Scripts/PlayerInteractions.cs
	UnityFolder/Assets/scene1.unity