initial commit
Merge remote branch 'DSLab/master'

Conflicts:
	.gitignore