Merge pull request #1 from jarrodmillman/master

Added Makefile, modified make_slides, and small bugfix.