commit
Merge branch 'master' of https://github.com/DaniloAM/Stamina

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