modified:   ../../mathematica
modified:   GNUmakefile
modified:   renumber
new file:   tmp.tex
Merge branch 'master' of github.com:peeterjoot/physicsplay

Conflicts:
	notes/blogit/renumber