Refactoring.
Merge branch 'master' into feature_branch

Conflicts:
	hello.rb
Merge pull request #1 from alexpennace/feature_branch

Refactoring.