modified file 1.rb
master modified file 1.rb
Merge branch 'testing'

Conflicts:
	1.rb