change becon
gitignore
gitignore
Merge branch 'master' of https://github.com/UlyssesD/AppMuseo

Conflicts:

MuseoAntropologia.xcodeproj/project.xcworkspace/xcuserdata/interazionesu
web.xcuserdatad/UserInterfaceState.xcuserstate
gitignore