guard-spork bake-in stable
Merge pull request #7 from fence-lizards-2014/quard_spork

guard-spork bake-in stable
fixed merge conflicts