Date comparison fix
Merge branch 'master' of github.com:arkiver/snacks

Conflicts:
	app/controllers/snacks_controller.rb