modified:   FrontBackmatter/preface.tex
modified:   classicthesis-config.tex
modified:   ../../bin/latexRegex.pl
modified:   ../../env/.aspell.en.pws
modified:   basicStatMechLecture5.tex
modified:   renumber
Merge branch 'master' of github.com:peeterjoot/physicsplay

Conflicts:
	notes/blogit/basicStatMechLecture5.tex
Merge branch '454text' of github.com:peeterjoot/physicsplay
Revert "Merge branch '454text' of github.com:peeterjoot/physicsplay"

This reverts commit 7452ef54a125929993aa9df4c80a0a8bd5cc2084, reversing
changes made to 79fdea4f879a68c6f0745d1994a8879b1c69c55f.

undo accidental merge of 454text branch:

modified:   notes/phy454/FrontBackmatter/preface.tex
modified:   notes/phy454/classicthesis-config.tex