calendar progress
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/AMSlideMenu/Main.storyboard
	FP/AMSlideMenu/TrainingObject.h
	FP/FinalProject.xcodeproj/project.pbxproj