LICENSE
Merge branch 'dev' of https://github.com/gitccsand/ds

Conflicts:
	LICENSE