git is stupid
added dots
Merge branch 'lol'

Conflicts:
	testscript1.R