developer functon1 by developer1
Merge branch 'testing'

Conflicts:
	test.rb