my first commit
Merge https://github.com/scottison/scottison-ds