new stuff
Merge branch 'master' of https://github.com/mjladd/metalgif
Resolving conflicts
Pulling in new material from @mjladd