init
Merge branch 'master' of github.com:daniel-leschkowski/generateDSv2

Conflicts:
	.gitignore