git super merge
Merge branch 'master' of https://github.com/DaniloAM/StaminaProject

Conflicts:
	Stamina/Stamina.xcodeproj/project.pbxproj
	Stamina/Stamina/GraphResultsVC.h
	Stamina/Stamina/Main.storyboard