First commit from local
Merge branch 'master' of github.com:ceguster/shindig-it