added features.txt
tweaked feature 1
tweak in faeture2
Merge branch 'faeture2'

Conflicts:
	features.txt