Imported dotConfig
Merge branch 'dotConfig' into badquanta

Conflicts:
	.gitmodules