seperate content from presentation
fix conflict then commit the result
add analytics
add analytics
.
add html with analytics for gh-pages to root