html changes
adding changes to file
Mikes changes
fixed merge errors
Merge pull request #2 from mekinney/html

Html