ok
Merge branch 'master' of https://github.com/qfdk/qfdk.github.io

Conflicts:
	index.html