added file 3
fixed index.html
another change to 3
Merge branch 'master' into iss53