Add guard and spork functionality
Merge branch 'master' of github.com:Krays/sample_app