committing someone's changes - hopefully this works
Merge remote-tracking branch 'origin/master'