made a change
Merge branch 'testing'

Conflicts:
	test.rb
Added a new line in test.rb in #testing.
Merge branch 'testing'

Conflicts:
	test.rb
done issue#53
new feature in master
Merged branch 'testing'
added a blank line for common use
testing editing the same file in different place # testing part #
testing editing the same file in different place # master part #
Merge branch 'testing', for testing editing the same file in different
part