Merge pull request #1 from allegralarche/master

added new workout layouts and activities