Algo
Merge branch 'master' of https://github.com/Ralvr/COACH-iPad

Conflicts:
	ProyectoCOach/ProyectoCOach/Base.lproj/Main.storyboard