merge fix
Merge branch 'master' of github.com:JoeBiggica/Shorts
short controller fix
Merge branch 'master' of github.com:JoeBiggica/Shorts
shorts create working
Merge branch 'master' of github.com:JoeBiggica/Shorts