resolving conflict on image filename
Merge branch 'teaching2014' of github.com:jonathan-taylor/stats-lecture-notes into teaching2014
added indexing section