working on haskell stuff, renaming directories
Merge branch 'master' of github.com:bsterrett/euler
Merging directory changes