created index.html
updated index
Merge branch 'develop'