minor, incremental
RStudio is in charge.

Merge branch 'master' of github.com:JohnD-oh/merge_clash_demo

Conflicts:
	demo_text.txt