Add an author/email comment
confused about how to 'resolve conflicts'...
Merge branch 'master' of https://github.com/mbigras/hello_world

Conflicts:
	hello.rb