Update feature.txt
by mac
.gitignore added
merged by mjp
f2
merged mjp
Merge pull request #2 from mortlake/feature02

Feature02