Hello
hello
try2
deleted
ignore
2
Functions
cleared up subsetting merge errors

Merge branch 'master' of github.com:meligu8/UBCadv-r into meligu8-master

Conflicts:
	02_Subsetting/Subsetting-Alathea.Rmd
	02_Subsetting/Subsetting-Alathea.html
	02_Subsetting/Subsetting-Alathea.md
	02_Subsetting/Subsetting-Andrew.Rmd
	02_Subsetting/Subsetting-Andrew.html
	02_Subsetting/Subsetting-Jenny.Rmd
	02_Subsetting/Subsetting-Jenny.html
	02_Subsetting/Subsetting-Jenny.md
	02_Subsetting/Subsetting_Susannah.Rmd
	README.md
Merge pull request #2 from aammd/master

Get changes from upstream
Jenny almost finish Functions
Merge branch 'meligu8-master'
Merge pull request #26 from adletaw/master

Environments notes.
Merge pull request #27 from jennybc/master

Jenny almost finish Functions