Delete c.txt
Update b.txt
Merge pull request #2 from lukaszbudnik/master

New features
File a changed

Body of file a.txt changed
Merge branch 'master' into Branch-1

Conflicts:
	b.txt
	c.txt
-new file a.txt
-deleted c.txt