Updating to the newest iteration
Merge branch 'master' of https://github.com/Fagertveit/image-theatre