renamed presentation.html to index.html
pre-merge
fixed merge
still trying