a
Merge branch 'new_feature'
aa
Merge branch 'new_feature'

Conflicts:
	README
update R
Merge branch 'new_feature'
R
M
Merge branch 'new_feature'

Conflicts:
	README