Rename 'ass' to 'assoc' for the name of the associtivity law of addition
Merge branch 'master' of https://github.com/tac-tics/book into tac-tics-master

Conflicts:
	macros.tex
	preliminaries.tex