made by master
Merge branch 'testing'
master
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'

* testing:
  from testing branch

Conflicts:
	test.rb
add file from master
Merge branch 'testing'

* testing:
  sdfasfa

Conflicts:
	test.rb
Merge branch 'testing'

* testing:
  wwww

Conflicts:
	test.rb
Merge branch 'testing'

Conflicts:
	test.rb