First commit
Merge branch 'master' of https://github.com/zeqL/SDZ

Conflicts:
	.gitignore