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

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

Conflicts:
	test.rb
Merge pull request #2 from evansimoni/evan

evan's commit message