committing the first shit
Merge branch 'master' of github.com:ericvicenti/theshit