added erlang
added haskell
added jimmy eat world to foo.txt
Merge branch 'erlang'