Omar's stuff.
Un-git random files causing conflicts. (PDFs still do; just overwrite with your own)

Added my stuff to the TEX :)