added alert
added index.html
Merge branch 'origin/master'