initial
Merge branch 'master' of https://github.com/skbeder/DATASS
pulled
Merge branch 'master' of https://github.com/skbeder/DATASS
initialized
set up test spider, switching to jays computer