Starting merge
Merge branch 'master' of https://github.com/TobbenTM/SSVD

Conflicts:
	bin/generate.py