Fixed index.html conflict
Merge branch 'master' of github.com:felamaslen/snake