Merge branch 'meisnate12:master' into master

pete2583/resolution.yml

@@ -21,7 +21,6 @@ templates:
       horizontal_align: left
       vertical_offset: 0
       vertical_align: top
-    collection_level: <<overlay_level>>
     ignore_blank_results: true
     suppress_overlays:
       - Directors-Cut
@@ -39,7 +38,7 @@ templates:
       - Criterion
     overlay:
       name: <<overlay_name>>
-      file: config/overlays/<<overlay>>.png
+      git: pete2583/overlays/<<overlay>>
       group: res
       weight: <<weight>>
       horizontal_offset: <<horizontal_offset>>