fixed workouts page logout problem
Merge branch 'master' of https://github.com/CS147Project/WebApp
merging
merging