test branch again
master changes
Merge branch 'SimpleBranch3'

Conflicts:

SimpleApp2.xcodeproj/project.xcworkspace/xcuserdata/carlosbrito.xcuserda
tad/UserInterfaceState.xcuserstate
gitignore