commiting so that things work
Merge branch 'master' of github.com:bartsnapp/ximeraCalculusPrelectures

Might have done it wrong

Conflicts:
	reviewOfFunctions/reviewOfFunctions.tex
Merge branch 'master' of github.com:bartsnapp/ximeraCalculusPrelectures

Conflicts:
	reviewOfFunctions/reviewOfFunctions.tex