fixed the last workout not showing up / added a 5 second timeout to go back to the beginning (I know this is hacky)
Merge remote-tracking branch 'upstream/master'