Create new line of text
One line added to the forked repo
Merge pull request #1 from chiramiso/patch-1

Yay, created a new line of text.
Merge pull request #2 from carolinagc/master

Another line added :-)
Merge branch 'master' of github.com:jr0cket/berlin-git-fun

Conflicts:
	new_text_file.txt

Conflicts:
	new_text_file.txt

this commits a new file
Merge branch 'master' of github.com:jr0cket/berlin-git-fun

merge with new files from jr0cket master
blablabalb commited
grbkl
bkj