figure mod.
updating conflicts.

Merge branch 'master' of github.com:nickreich/methods2

Conflicts:
	class2_SLRIntro/figure/plotHeights.pdf