ok
modified!!
Merge branch 'testing'
modify test branch
modify master
Merge branch 'testing'

Conflicts:
	project.properties
m
add some text
add a comment
test