changed duration to minutes/seconds and adjusted timer
added everything from pull
fixing merge conflicts
pause/resume button, links to congrats page when workout is done, fixed min/sec in create
added stuff from master
Merge pull request #27 from Fit-Genie/tweak

Tweak