aggiunto armi.txt
Merge branch 'master' of https://github.com/Nockess/nockess-dev

Conflicts:
	dev.xcworkspace/contents.xcworkspacedata

dev.xcworkspace/xcuserdata/puskin.xcuserdatad/UserInterfaceState.xcusers
tate
	main