merge
Merge branch 'master' of https://github.com/MiddlesexCS/latex_intro

Conflicts:
	CS_induction_talk.tex