changed message
Merge https://github.com/etipton94/git-demo

Conflicts:
	hello.rb