Fix Delete button
Merge branch 'master' of github.com:JoeBiggica/Shorts

Conflicts:
	app/views/shorts/show.html.erb