first commit
changed the class name
added from ruby
Merge branch 'change_class'
fixed readme title
fixed readme title differently
Merge branch 'fix_readme'

Conflicts:
	README
added erlang
added haskell
foo
fooo
All is well
firstcommit
changingstuff
updated README
added two files
branch
Merge branch 'testing'
added comment
Merge branch 'erlang'
yeah

Conflicts:
	README
resolved conflicts