Adding hello.txt to the project
adding world
adding more files....
blah
conflicting file?
Adding yet another line from branch2
Merge branch 'master' into branch2

Conflicts:
	hello.txt
Added a whole lotta stuff
Added some stuff to master
asdf
whaever
whaever
whaever
Why am i adding a difff????
stuff
Merge branch 'master' of https://github.com/benedictchen/myrepo
removed dummy files