got cancel button working
named the task buttons in HTML and set up pseudo-code for the JS actions on those buttons
pushing before attempting to merge with latest master
fixed merge conflicts.
Merge pull request #3 from Gloryofthe80s/jacob_branch

Jacob branch