addFeatures's modify commit

you know
addFeature2 modify
Merge branch 'addFeatures2'

Conflicts:
	firstFile.rtf
Merge branch 'master' of https://github.com/godyZ/testR