merging changes
Merge branch 'master' of https://github.com/tkmharris/tom_tex

Conflicts:
	binaryK_talk.tex
Merge branch 'master' of https://github.com/tkmharris/tom_tex