closes #57
Merge pull request #85 from KelseyLMay/branchedithtml

closes #57