just a local commit....
Merge branch 'master' of https://github.com/crucalculus/calcbook
fixed the merge conflict...
Conflicts:
	main.tex
deleting generated files...
Merge branch 'master' of https://github.com/crucalculus/calcbook