Removed non VCS files
Edited index.html
Merged upstream
Updaetd gitignore