added git-show-merges screenshot images, which for some reason were missing
treebead0c652a19ad7dde459fa0c689de7d01f44cd7
-rw-r--r-- 687 Rakefile
drwxr-xr-x - bin
drwxr-xr-x - www