extract features takes an optional file argument
Merge branch 'master' of github.com:cstack/Nutrition-Predictor
merge files script and comments to extract features
merge conflict resolution