fixed merge
fixed merge

Merge branch 'master' of https://github.com/rparrish/Presentations

Conflicts:
	RStudio Intro/RStudio_Introduction.Rpres
	RStudio Intro/RStudio_Introduction.md