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
Added the functionals file
Merge remote-tracking branch 'upstream/master'
exercise 3
updated exercises
updated exercises
a few more answers from Andrew
updated notes
Merge remote-tracking branch 'upstream/master'
Davor's solutions to exercises for Functionals
Functionals

Functionals
Merge pull request #44 from adletaw/master

Alathea functionals
Merge pull request #43 from cubranic/Davor_functionals

Davor's solutions to exercises for Functionals
Merge pull request #45 from meligu8/master

functionals
functionals from Andrew
Answering mathematical computer challenges
Added my knitr cache and the final exercise: approximations to the tangent line
moved Melissa's files