local cleanup
Merge branch 'master' of github.com:johnEsacks/ice-cream-shot