ssss
Merge branch 'testing'

* testing:
  sssss
  wswww
master
Merge branch 'testing'

* testing:
  tttt

Conflicts:
	test.rb
aaaaa
Merge branch 'testing'

Conflicts:
	test.rb