Update.
Merge branch 'master' of github.com:neurodebian/psychotut