bar
Merge branch 'br1' of github.com:ekazakov/MagitTest into br1

Conflicts:
	backbone.js
foo
Merge branch 'br1' of github.com:ekazakov/MagitTest into br1

Conflicts:
	foo.txt