initial commit (everything isn't working)
Merge branch 'master' of https://github.com/johndgiese/python