modified:   figures
modified:   mathematica
Merge branch 'master' of github.com:peeterjoot/physicsplay

Conflicts:
	figures
	mathematica
Merge branch 'master' of github.com:peeterjoot/physicsplay