mergin
merging
Merge branch 'master' of https://github.com/CS147Project/WebApp
fixing goWorkout bug with one form