This is a test.
test2

Merge branch 'master' of github.com:Dustin21/Hello-World

Conflicts:
	Hello World.Rmd