Added the zlib
merge branch 'master' of github.com:smilefreak/MerrimanSelectionPipeline
Made some edits to the tex file
Fixed merge