shortening
Merge branch 'master' of github.com:jmhinric/rubygolf

Conflicts:
	lib/golf.rb
Merge branch 'master' of github.com:jmhinric/rubygolf

Conflicts:
	lib/golf.rb