shorts show changes
Merge branch 'master' of github.com:JoeBiggica/Shorts
shorts show add working
Merge branch 'master' of github.com:JoeBiggica/Shorts