commit without bug, i hope !
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/CurrentTrainTableViewController.m
	FP/FinalProject.xcodeproj/project.pbxproj
	FP/StartWorkOutVC.m