rock movement
Merge branch 'master' of https://github.com/Ret44/PrivateEye

Conflicts:
	Assets/rock.cs