Gets file upload to Astra working
Merge branch 'master' of github.com:JoeBiggica/Shorts

Conflicts:
	app/controllers/shorts_controller.rb
Merge branch 'master' of github.com:JoeBiggica/Shorts into design
made background for all