Merge branch 'master' of github.com:ruby-jokes/close_enough

Conflicts:
	lib/close_enough.rb
Merge branch 'master' of github.com:mgates/close_enough

Conflicts:
	lib/close_enough.rb