more edits
more edits

Merge branch 'master' of https://github.com/karisitha/UW-Rroom

Conflicts:
	testscript.R