myBranchCommit
masterCommit
Merge branch 'refs/heads/myBranch'

Conflicts:
	Scrob/Scrob/MainPage.xaml.cs