Updated workshop4_inferential.Rmd and workshop4_preworkshop.Rmd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/workshop4_preworkshop.Rmd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/workshop4_preworkshop.Rmd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/workshop4_preworkshop.Rmd