added another mesh variable called rock1
merge conflicts
rock
starting rock texturing
Merge branch 'master' into eribranch

trying to merge eribranch to master
issues
rock with texture
merge shit
rock and sphere