added erlang
added haskell
Merge branch 'erlang' to master