Merged features

naive_bayes file is merged (conflicts resolved)