merging eric's changes to the intro into that branch on my repo