trying to merge properly

Merge remote-tracking branch 'upstream/master'

Conflicts:
	02_Subsetting/Subsetting-Jenny.Rmd
try again

Merge remote-tracking branch 'upstream/master'

Conflicts:
	02_Subsetting/Subsetting-Jenny.Rmd
trying to keep up to date
Functionals

Functionals
Merge pull request #45 from meligu8/master

functionals