Initial commit
Added basic HTML structure
image test
added an image
more edits to the html
resolved conflict
Merge branch 'working-pages' into gh-pages