fidlling with ruby version
Merge branch 'master' of https://github.com/jmhinric/rubygolf

Conflicts:
	.ruby-version