updated readme
added html elements
fix conflict
Merge pull request #1 from MatthewRichard/first-cut

First cut