Minor commit forced by git pull.
Merge branch 'master' of https://github.com/galegosimpatico/academia

Conflicts:
	experimental/test3.py
Sync pushing all to remote origin.