asd
Merge branch 'master' of https://github.com/JoaoSisanoski/TemplateParaiOSFinal

Conflicts:
	TemplateiOsFinal/Base.lproj/Main_iPhone.storyboard