merge index.html
Merge branch 'master' of
https://github.com/nikytwo/nikytwo.github.io.git

Conflicts:
	index.html