Local Change
Merge

Merge branch 'master' of https://github.com/nahumj/rstudio

Conflicts:
	script.R