inti commit
Merge branch 'master' of https://github.com/JasonJiang335/ruby_test1

Conflicts:
	.gitignore
git debug3