Finished img opacity
Finished merge conflicts
Merge pull request #15 from dgoodman1224/ss-image-formatting

Ss image formatting