.
Merge branch 'master' of github.com:fukuchi/tinker

Conflicts:
	lib/tinker/graphics.rb