Rebase Required?
Bla
Merge branch 'master' of https://github.com/mortiy/git-sandbox into test-branch-2

Conflicts:
	script.js