total order table fix
Merge branch 'master' of github.com:arkiver/snacks

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