merge shijie and i's work
make our presentation index.html