update
Merge branch 'master' of http://github.com/h55nick/python-testing