Merge branch 'master' of https://github.com/ayniat/66

Conflicts:
.idea/workspace.xml
index-1.html
index-2.html
index-3.html
index-4.html
index-5.html
index.html
KD commit