Feature functions added
Feature functions added

Conflicts:
feature_functions.py
Conflict resolved?
Conflict resolved?