adn test.rb to testing branch
Merge branch 'testing' into newbranch

Conflicts:
	test.rb