new update 2-18
updated gym activity with calendar
fixed conflicts
deleted .files
Merge pull request #53 from Lhernand/master

gym