this feature rules
I didnot want to hose anything
Update feature.js
added comment
resolved conflict
Merge pull request #1 from heissmusik/feature

implements the feature that rules