add a little change
Merge pull request #1 from Williampangestu/william

add a little change
my crazy changes
Merge branch 'master' into evan

Conflicts:
	test.rb