add file test to branch test
add file test to branch master
Merge branch 'testing'

Conflicts:
	test.rb