master va avanti
fatto niente
Merge branch 'branch2'

Conflicts:

PrimoGit/PrimoGit.xcodeproj/project.xcworkspace/xcuserdata/daniele.xcuse
rdatad/UserInterfaceState.xcuserstate
Revert al secondo "fatto niente"

This rolls back to commit 1e6ee61779aee17fa6f16f69f7e3edb40a8f5cfb.
Revert "master va avanti"

Conflicts:

PrimoGit/PrimoGit.xcodeproj/project.xcworkspace/xcuserdata/daniele.xcuse
rdatad/UserInterfaceState.xcuserstate
	PrimoGit/PrimoGit/ViewController.m
asd
ritornato al master va avanti
Merge branch 'master' into branch2

Conflicts:

PrimoGit/PrimoGit.xcodeproj/project.xcworkspace/xcuserdata/daniele.xcuse
rdatad/UserInterfaceState.xcuserstate