4th change
made a 5th change
made a 6th change
Merge branch 'testing'

Conflicts:
	test.rb
7th change