Added haskell.txt file
Added scala files
Merge remote-tracking branch 'fred-origin/master'