Added .git-setup for other branches to set master as a sibling.
Merge branch 'master' into sistemi