init
Merge branch 'master' of https://github.com/Zjaaspoer/submodule

Conflicts:
	.gitignore