Merging in Matt's changes
Merge branch 'John's-branch' into Merge-presentation

Conflicts:
	.gitignore
	LaTeX Talk File/section/introduction.tex
	LaTeX Talk File/section/our_work.tex
	LaTeX Talk File/section/previous_work.tex