my hola mundo changes
"Oh yeah."
it stops raining
added two files
removed useless files
changed the class name
added from ruby
Another merge.  Merge branch 'change_class'

Conflicts:
	hello.rb
haskel add reverted to old class name