in class Jan 28
Merge pull request #1 from sjudson/master

Sam's code.
my code
Merge pull request #2 from JacobRoberts/master

my code - Don't you have admin rights? - Sam
Added Haskell and fixed readme page.