Jordan
Merge branch 'master' of https://github.com/lordofwhales/turuby

Conflicts:
	turuby.rb