added bye to hello
Merge branch 'master' of https://github.com/etipton94/git-demo

Conflicts:
	hello.rb