initial commit local
Merge branch 'master' of github.com:joe-vanleeuwen/shatter