Added a bunch of Haskell stuff
Merge branch 'master' of https://github.com/adc90/SandBox
Merged the laptop files with the desktop