Merge branch 'gh-pages'
added a credit
Merge branch 'master' into gh-pages
took out "mini" for the buttons.
Merge branch 'master' into gh-pages
changes

made changes to my form. Decided to do the aerobic one for the timer
and the lifting is now changed to 30-day challenges. This will allow
for JSON data to be coded prior to implementation.
Merge branch 'master' into gh-pages
json data

added the JSON data for the nine challenge options.
Merge branch 'master' into gh-pages
adding code

Added a ul on the html
Added code for showWorkOut
Merge branch 'master' into gh-pages
code code code

adding more of the code. Just realized it was more JS not jQ…so it'll
be fixed.
Merge branch 'master' into gh-pages
jQuery

refactoring code into jQuery. Finally a breakthru in understanding!
Merge branch 'master' into gh-pages