commit bem depois olha os altos bugs ae
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/AMSlideMenu/Main.storyboard
	FP/CurrentTrainTableViewController.m