first commit for github
Merge branch 'master' of https://github.com/mattcieslak/DSI2