the words in git anyway
Merge branch 'master' of github.com:wijnanb/djangotcha