hh
Merge branch 'master' of https://github.com/lampe142/statistics_unit_3

Conflicts:
	content.Rnw
Merge branch 'master' of https://github.com/lampe142/statistics_unit_3

Conflicts:
	content.Rnw