merged index.html
Merge branch 'master' of https://github.com/team-m-org/el