new version
Merge branch 'master' of ssh://github.com/cryptoedu/cryptoedu.github.io

Conflicts:
	index.html