Merge branch 'master' of http://github.com/ds-sww/codebase into assignment3
assignment3[solution]
delete genData.txt
assignment2
Merge branch 'assignment2' of github.com:novinsomnia/codebase into temp
Merge pull request #251 from whimsycwd/master

Rebase  for novinsomnia