done
Merge branch 'master' of https://github.com/Jinxy5/laughing-octo-lana into branchbackup

new slideshow implemented
done