Merge branch 'master' of /Users/Jeanne/SlideSnap/slidesnap with conflicts.