Step 1: removing dead client/index.html
Merge remote-tracking branch 'origin/master'
Step 2: client/index2.html -> client/index.html