add file test to branch master
Merge branch 'testing'

Conflicts:
	test.rb
Merge branch 'master' into newbranch

Conflicts:
	test.rb