added content to other/file
added other/thing
Merge remote-tracking branch 'origin/master' into test_2