my commit message
Merge branch 'master' into evan

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

evan's commit message