Rock pickup fixes
Merge branch 'master' of https://github.com/ndclark/FOREST-GAME

Conflicts:
	UnityFolder/Assets/scene1.unity