Merge pull request #6 from marcusmichaels/master

merge master bates
Merge pull request #7 from marcusmichaels/master

timing fixes hopefully.
Merge pull request #8 from marcusmichaels/master

fixes time
Merge pull request #9 from marcusmichaels/master

bloody rest period too long.
Merge pull request #10 from marcusmichaels/master

Fixes timing and reduces workout periods
Merge pull request #12 from marcusmichaels/gh-pages

Merge