astra working
Merge branch 'master' of github.com:JoeBiggica/Shorts into design
stuff