Updated intro slides and master makefile (in case they are used) to reflect the schedule in Matt's slides
Minor correction to makefile
Merge remote-tracking branch 'origin/master' into gh-pages