rock 1-7, tall tree, bush 1-4,  log 1
no message
Merge remote-tracking branch 'origin/master'