finished xml and html
Merge branch 'gh-pages'