end start screen
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/AMSlideMenu/Main.storyboard
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/AMSlideMenu/Main.storyboard
z