Commit
Merge branch 'master' of https://github.com/GNilsonne/Test

Conflicts:
	test2.R