Add files
made a change
made an other change
Merge branch 'testing'

Conflicts:
	test.rb
first commit in iss53 branch