fix images
Merge branch 'master' of https://github.com/DaniloAM/StaminaProject

Conflicts:
	Stamina/Stamina.xcodeproj/project.pbxproj

Stamina/Stamina.xcodeproj/project.xcworkspace/xcuserdata/DaniloAM.xcuser
datad/UserInterfaceState.xcuserstate