marek file
marek2 file
new content
new content in marek2
Merge branch 'new_branch' asdf
modification in marek2
another modification in marek2
Merge branch 'new_branch' asdfsadfasdfsadf

Conflicts:
	marek2
Merge remote-tracking branch 'upstream/master'