pulling latest commits
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
added ability to add workouts
fixed merge conflicts
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development