has everything
Merge branch 'master' of https://github.com/jonathan-hwang/workout-app into jonathan