file2 edited online with Bitbucket
Merge remote-tracking branch 'github/master'