here it comes
Merge branch 'master' of https://github.com/DaniloAM/StaminaProject

Conflicts:
	Stamina/Stamina/Main.storyboard