Extended mapFeature in hw2 to account for any feature count

mapFeature has been extended for use with 3 features, and has been
notated for extension to any feature count.