Merge pull request #1 from ksavietta/master

Pulling change to hello.rb made by Kelly.
Merge pull request #2 from hchood/master

Merge pull request #1 from ksavietta/master