Revert "commit do bug"

This reverts commit ff61cd7e5038f6a1f93a8a549d568efaf8b21ecf.
fix
Merge branch 'master' of https://github.com/JoaoSisanoski/TemplateParaiOSFinal

Conflicts:

TemplateiOsFinal.xcodeproj/project.xcworkspace/xcuserdata/DaniloAM.xcuse
rdatad/UserInterfaceState.xcuserstate
	TemplateiOsFinal/Base.lproj/Main_iPhone.storyboard