changes
blah
Merge pull request #2 from Harkin/master

haskell stuff