Merged.
Deleted.
Merge branch 'master' of https://github.com/witlab/witlab.github.io.git

Conflicts:
	index.html
	params.json